diff --git a/configure b/configure
index cea4ad92f9..c3aa6eb749 100755
--- a/configure
+++ b/configure
@@ -26996,8 +26996,14 @@ fi
 
 
 
+            case "${host}" in
+	x86_64-*-mingw32* )
+                        LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+        ;;
+        * )
             LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+        ;;
+    esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     fi
@@ -40000,6 +40006,8 @@ echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
 else
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
+	x86_64-*-mingw32* )
+        ;;
         *-*-mingw32* )
                         echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
 echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6
diff --git a/configure.in b/configure.in
index 252d33b4f5..9ffb85c5c2 100644
--- a/configure.in
+++ b/configure.in
@@ -3212,8 +3212,15 @@ if test "$USE_WIN32" = 1 ; then
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.
-    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+    case "${host}" in
+	x86_64-*-mingw32* )
+            dnl --- For mingw-w64 lctl3d32's name has changed
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+        ;;
+        * )
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+        ;;
+    esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     fi
@@ -5621,6 +5628,8 @@ dnl from if !MSW
 else
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
+	x86_64-*-mingw32* )
+        ;;
         *-*-mingw32* )
             dnl check if the compiler accepts -mthreads
             AC_CACHE_CHECK([if compiler supports -mthreads],