diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4c5cc219fc9..505994bd1e3 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-03  Jason Rumney  <jasonr@gnu.org>
+
+	* configure.bat: Make gcc the default compiler.
+
 2008-02-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (unidatagen-SH, unidatagen-clean-SH): Ignore
diff --git a/nt/configure.bat b/nt/configure.bat
index 24719c67863..ed0fa94724a 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -244,15 +244,16 @@ rem   Auto-detect compiler if not specified, and validate GCC if chosen.
 if (%COMPILER%)==(cl) goto compilercheckdone
 if (%COMPILER%)==(gcc) goto checkgcc
 
-echo Checking whether 'cl' is available...
+echo Checking whether 'gcc' is available...
 echo main(){} >junk.c
+gcc -c junk.c
+if exist junk.o goto checkgcc
+del junk.o
+
+echo Checking whether 'cl' is available...
 cl -nologo -c junk.c
 if exist junk.obj goto clOK
-
-echo Checking whether 'gcc' is available...
-gcc -c junk.c
-if not exist junk.o goto nocompiler
-del junk.o
+goto nocompiler
 
 :checkgcc
 Rem WARNING -- COMMAND.COM on some systems only looks at the first