diff --git a/external/jpeg/CMakeLists.txt b/external/jpeg/CMakeLists.txt
index 1c58ee66e3..5e105d34af 100644
--- a/external/jpeg/CMakeLists.txt
+++ b/external/jpeg/CMakeLists.txt
@@ -5,7 +5,7 @@ if(CMAKE_EXECUTABLE_SUFFIX)
 endif()
 
 project(libjpeg-turbo C)
-set(VERSION 2.1.0)
+set(VERSION 2.1.1)
 string(REPLACE "." ";" VERSION_TRIPLET ${VERSION})
 list(GET VERSION_TRIPLET 0 VERSION_MAJOR)
 list(GET VERSION_TRIPLET 1 VERSION_MINOR)
diff --git a/external/jpeg/ChangeLog.md b/external/jpeg/ChangeLog.md
index 498b8f2729..5ecbf3b510 100644
--- a/external/jpeg/ChangeLog.md
+++ b/external/jpeg/ChangeLog.md
@@ -1,3 +1,12 @@
+2.1.1
+=====
+
+### Significant changes relative to 2.1.0
+
+1. Fixed a regression introduced in 2.1.0 that caused build failures with
+non-GCC-compatible compilers for Un*x/Arm platforms.
+
+
 2.1.0
 =====
 
diff --git a/external/jpeg/jchuff.c b/external/jpeg/jchuff.c
index 2bce767ebd..8ff817b151 100644
--- a/external/jpeg/jchuff.c
+++ b/external/jpeg/jchuff.c
@@ -44,8 +44,9 @@
  * flags (this defines __thumb__).
  */
 
-#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \
-    defined(_M_ARM64)
+/* NOTE: Both GCC and Clang define __GNUC__ */
+#if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \
+    defined(_M_ARM) || defined(_M_ARM64)
 #if !defined(__thumb__) || defined(__thumb2__)
 #define USE_CLZ_INTRINSIC
 #endif
diff --git a/external/jpeg/jcphuff.c b/external/jpeg/jcphuff.c
index bd14fc27d5..9bf96124b4 100644
--- a/external/jpeg/jcphuff.c
+++ b/external/jpeg/jcphuff.c
@@ -52,8 +52,9 @@
  * flags (this defines __thumb__).
  */
 
-#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || \
-    defined(_M_ARM64)
+/* NOTE: Both GCC and Clang define __GNUC__ */
+#if (defined(__GNUC__) && (defined(__arm__) || defined(__aarch64__))) || \
+    defined(_M_ARM) || defined(_M_ARM64)
 #if !defined(__thumb__) || defined(__thumb2__)
 #define USE_CLZ_INTRINSIC
 #endif