diff --git a/configure b/configure
index 82f8539f890..67ae35cec27 100755
--- a/configure
+++ b/configure
@@ -5450,6 +5450,12 @@ then
         if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then
            WRAP="-fwrapv"
         fi
+
+        # Clang also needs -fwrapv
+        if test "$CC" = "clang" ; then
+            WRAP="-fwrapv"
+        fi
+
 	case $ac_cv_prog_cc_g in
 	yes)
 	    if test "$Py_DEBUG" = 'true' ; then
diff --git a/configure.in b/configure.in
index 5a16bb0dea1..315a83234ea 100644
--- a/configure.in
+++ b/configure.in
@@ -905,6 +905,12 @@ then
         if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then
            WRAP="-fwrapv"
         fi
+
+        # Clang also needs -fwrapv
+        if test "$CC" = "clang" ; then
+            WRAP="-fwrapv"
+        fi
+
 	case $ac_cv_prog_cc_g in
 	yes)
 	    if test "$Py_DEBUG" = 'true' ; then