diff --git a/var/spack/repos/builtin/packages/py-gevent/icc.patch b/var/spack/repos/builtin/packages/py-gevent/icc.patch
new file mode 100644
index 0000000000..8c696b64b2
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-gevent/icc.patch
@@ -0,0 +1,14 @@
+diff -Nur spack-src/deps/c-ares/configure spack-src.patched/deps/c-ares/configure
+--- spack-src/deps/c-ares/configure	2022-07-01 14:04:01.014254504 +0000
++++ spack-src.patched/deps/c-ares/configure	2022-07-01 14:02:33.518090648 +0000
+@@ -20480,8 +20480,8 @@
+       INTEL_UNIX_C)
+         #
+                         tmp_CFLAGS="$tmp_CFLAGS -std=gnu89"
+-                                                tmp_CPPFLAGS="$tmp_CPPFLAGS -we 140,147,165,266"
+-                                        tmp_CPPFLAGS="$tmp_CPPFLAGS -wd 279,981,1469"
++                                                tmp_CPPFLAGS="$tmp_CPPFLAGS -diag-error 140,147,165,266"
++                                        tmp_CPPFLAGS="$tmp_CPPFLAGS -diag-disable 279,981,1469"
+         ;;
+         #
+       INTEL_WINDOWS_C)
diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py
index dafb598df7..f16d8688af 100644
--- a/var/spack/repos/builtin/packages/py-gevent/package.py
+++ b/var/spack/repos/builtin/packages/py-gevent/package.py
@@ -35,3 +35,6 @@ class PyGevent(PythonPackage):
     depends_on('py-greenlet@0.4.13:', when='@:1.4', type=('build', 'run'))
     depends_on('py-zope-event', when='@20.5.1:', type=('build', 'run'))
     depends_on('py-zope-interface', when='@20.5.1:', type=('build', 'run'))
+
+    # Deprecated compiler options. upstream PR: https://github.com/gevent/gevent/pull/1896
+    patch('icc.patch', when='%intel')