diff --git a/configure b/configure
index 139a32c451a..fd09324bc34 100755
--- a/configure
+++ b/configure
@@ -14171,6 +14171,31 @@ fi
 $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; }
 if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then :
   EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers"
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5
+$as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; }
+if ${ac_cv_cflags__Wshift_overflow_2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_wine_try_cflags_saved=$CFLAGS
+CFLAGS="$CFLAGS -Wshift-overflow=2"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(int argc, char **argv) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_cflags__Wshift_overflow_2=yes
+else
+  ac_cv_cflags__Wshift_overflow_2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_wine_try_cflags_saved
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wshift_overflow_2" >&5
+$as_echo "$ac_cv_cflags__Wshift_overflow_2" >&6; }
+if test "x$ac_cv_cflags__Wshift_overflow_2" = xyes; then :
+  EXTRACFLAGS="$EXTRACFLAGS -Wshift-overflow=2"
 fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wstrict-prototypes" >&5
 $as_echo_n "checking whether the compiler supports -Wstrict-prototypes... " >&6; }
diff --git a/configure.ac b/configure.ac
index c4ba1a32dc3..3180407bfc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1837,6 +1837,7 @@ then
   WINE_TRY_CFLAGS([-Wdeclaration-after-statement])
   WINE_TRY_CFLAGS([-Wempty-body])
   WINE_TRY_CFLAGS([-Wignored-qualifiers])
+  WINE_TRY_CFLAGS([-Wshift-overflow=2])
   WINE_TRY_CFLAGS([-Wstrict-prototypes])
   WINE_TRY_CFLAGS([-Wtype-limits])
   WINE_TRY_CFLAGS([-Wunused-but-set-parameter])