diff --git a/configure b/configure
index 34b8217b751..7ab9c8e9f42 100755
--- a/configure
+++ b/configure
@@ -3877,17 +3877,21 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       notice_platform="32-bit "
       TARGETFLAGS="-m32"
 
+      enable_win16=${enable_win16:-yes}
     else
       TARGETFLAGS="-m64"
 
     fi
     ;;
+  *-mingw32*)
+    enable_win16=${enable_win16:-no}
+    ;;
+  i[3456789]86*)
+    enable_win16=${enable_win16:-yes}
+    ;;
 esac
 
-case $host_cpu in
-  *i[3456789]86*) enable_win16=${enable_win16:-yes} ;;
-  *)                enable_win16=${enable_win16:-no} ;;
-esac
+enable_win16=${enable_win16:-no}
 
 WIN16_FILES="\$(WIN16_FILES)"
 
diff --git a/configure.ac b/configure.ac
index f154b401cfc..06afdf90494 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,17 +116,21 @@ case $host in
       host_cpu="i386"
       notice_platform="32-bit "
       AC_SUBST(TARGETFLAGS,"-m32")
+      enable_win16=${enable_win16:-yes}
     else
       AC_SUBST(TARGETFLAGS,"-m64")
     fi
     ;;
+  *-mingw32*)
+    enable_win16=${enable_win16:-no}
+    ;;
+  i[[3456789]]86*)
+    enable_win16=${enable_win16:-yes}
+    ;;
 esac
 
 dnl enable_win16 defaults to yes on x86, to no on other CPUs
-case $host_cpu in
-  *i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;;
-  *)                enable_win16=${enable_win16:-no} ;;
-esac
+enable_win16=${enable_win16:-no}
 
 AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)")
 AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)")