diff --git a/makecheck.sh b/makecheck.sh
index 918f46a9..a031f7ab 100755
--- a/makecheck.sh
+++ b/makecheck.sh
@@ -17,6 +17,30 @@ if ! $SOURCE/configure; then
 	exit 1
 fi
 
-if ! time make check; then
+if ! make -j4; then
+	exit 1
+fi
+
+if ! make check; then
+	exit 1
+fi
+
+if ! make distclean; then
+	exit 1
+fi
+
+if ! $SOURCE/configure --host=x86_64-w64-mingw32.static --build=`$SOURCE/config.guess`; then
+	exit 1
+fi
+
+if ! make -j4; then
+	exit 1
+fi
+
+if ! make check; then
+	exit 1
+fi
+
+if ! make distclean; then
 	exit 1
 fi
diff --git a/makedist.sh b/makedist.sh
index 4188914e..a52797b9 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -1,17 +1,6 @@
 #!/bin/sh
 #
 
-CHECK=check
-DEBUG=
-
-if test "x$1" = "x-f"; then
-CHECK=all
-fi
-
-if test "x$1" = "x-d"; then
-DEBUG=--enable-debug
-fi
-
 # Ask root permissions at the start
 sudo echo We are root
 
@@ -20,7 +9,7 @@ make distclean
 # Reconfigure (with force) to get the latest revision from git
 autoreconf -f
 
-if ! ./configure.windows-x86 $DEBUG; then
+if ! ./configure.windows-x86; then
 	exit 1
 fi
 
@@ -32,11 +21,11 @@ if ! make distwindows-x86 distclean; then
 	exit 1
 fi
 
-if ! ./configure.windows-x64 $DEBUG; then
+if ! ./configure.windows-x64; then
 	exit 1
 fi
 
-if ! make -j4 $CHECK; then
+if ! make -j4; then
 	exit 1
 fi