diff --git a/tools/build-mingw32.sh b/tools/build-mingw32.sh
index 3138ef66..bc91843e 100755
--- a/tools/build-mingw32.sh
+++ b/tools/build-mingw32.sh
@@ -24,7 +24,16 @@
 MINGW32_PREFIX=${MINGW32_PREFIX:-/usr/local/mingw32}
 LIBUSB_PREFIX=${LIBUSB_PREFIX:-/WINDOWS/ProgramFiles/LibUSB-Win32}
 
-CC=mingw32-gcc
+for CC in mingw32-gcc i686-w64-mingw32-gcc
+do
+    touch foo.c
+    if ${cc} -c foo.c 2> /dev/null
+    then
+	rm -f foo.*
+	break
+    fi
+done
+tgt=$(expr "$CC" : "\(.*\)-gcc")
 
 BUILDDIR=build-mingw32
 mkdir -p ${BUILDDIR} || { echo "Cannot create build dir $BUILDDIR"; exit 1; }
@@ -40,6 +49,6 @@ env \
     LDFLAGS="${LDFLAGS}" \
     ../../configure \
     --host=$(../../config.guess) \
-    --target=i386-unknowns-mingw32
+    --target=${tgt}
 
 make all