diff --git a/.travis.yml b/.travis.yml
index edca5f63..8d585843 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,6 +119,22 @@ jobs:
         - CXX='clang++-9 -fsanitize=address -stdlib=libc++'
         - PART=2
 
+    - name: "ICC"
+      stage: check
+      os: linux
+      compiler: icc
+      env:
+        - CC=icc
+        - CXX=icpc
+      install:
+        - source /opt/intel/inteloneapi/compiler/latest/env/vars.sh
+      addons:
+        apt:
+          sources:
+          - sourceline: 'deb https://apt.repos.intel.com/oneapi all main'
+            key_url: 'https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB'
+          packages:
+          - intel-oneapi-icc
 
     ## ----- ##
     ## GCC.  ##
diff --git a/THANKS b/THANKS
index 01c9246e..46de4dc2 100644
--- a/THANKS
+++ b/THANKS
@@ -60,6 +60,7 @@ Enrico Scholz             enrico.scholz@informatik.tu-chemnitz.de
 Eric Blake                ebb9@byu.net
 Eric S. Raymond           esr@thyrsus.com
 Étienne Renault           renault@lrde.epita.fr
+Evan Nemerson             evan@nemerson.com
 Evgeny Stambulchik        fnevgeny@plasma-gate.weizmann.ac.il
 Fabrice Bauzac            noon@cote-dazur.com
 Ferdinand Thiessen        ferdinand@fthiessen.de
@@ -79,6 +80,7 @@ Hans Åberg                haberg-1@telia.com
 Horst Von Brand           vonbrand@inf.utfsm.cl
 Jan Nieuwenhuizen         janneke@gnu.org
 Jannick                   thirdedition@gmx.net
+Jeff Hammond              jeff_hammond@acm.org
 Jerry Quinn               jlquinn@optonline.net
 Jesse Thilo               jthilo@gnu.org
 Jim Kent                  jkent@arch.sel.sony.com
diff --git a/configure.ac b/configure.ac
index 3f144cbc..68c54a12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,13 +102,41 @@ if test "$enable_gcc_warnings" = yes; then
   # -Wno-tautological-constant-out-of-range-compare for Clang 3.3 and
   # 3.4 on GNU/Linux that choke on intprops.h's INT_MULTIPLY_WRAPV,
   # etc.
+  #
+  # ICC: -wr188
+  #
+  # 1669  warnings warnings_default =
+  # ../src/complain.c(318): error #188: enumerated type mixed with another type
+  # 1670      Wconflicts_sr | Wconflicts_rr | Wdeprecated | Wother;
+  # 1671      ^
+  # 1672
+  # 1673../src/complain.c(393): error #188: enumerated type mixed with another type
+  # 1674          warnings w = 1 << wbit;
+  # 1675                       ^
+  #
+  # ICC: -wr3179
+  #
+  # char const *usefulness
+  #   = rule_useless_in_grammar_p (&rules[r]) ? "useless-in-grammar"
+  #   : rule_useless_in_parser_p (&rules[r])  ? "useless-in-parser"
+  #   :                                         "useful";
+  #
+  # gives
+  #
+  # error #3179: deprecated conversion of string literal to char* (should be const char*)
+  #
+  # ICC: -wr2259 (that's in C, in spite of what the error messages which seems to be about C++).
+  # error #2259: non-pointer conversion from "int" to "yybool={signed char}" may lose significant bits
+  #   yybool yynormal YY_ATTRIBUTE_UNUSED = yystackp->yysplitPoint == YY_NULLPTR;
+  #                                         ^
   warn_common='-Wall -Wextra
     -Wcast-align -Wchar-subscripts
     -fparse-all-comments -Wdocumentation
     -Wformat -Wimplicit-fallthrough -Wnull-dereference
     -Wno-sign-compare -Wno-tautological-constant-out-of-range-compare
     -Wpointer-arith -Wshadow
-    -Wwrite-strings'
+    -Wwrite-strings
+    -wr188 -wr2259 -wr3179'
   warn_c='-Wbad-function-cast -Wstrict-prototypes'
   warn_cxx='-Wextra-semi -Wnoexcept -Wold-style-cast -Wundefined-func-template
     -Wweak-vtables'