diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3da2760eeea..445639c27df 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-05  Eli Zaretskii <eliz@is.elta.co.il>
+
+	* configure.bat: Use correct options when compiling a test program
+	with Cygwin.  From David Ponce <dponce@voila.fr>.
+
 2001-02-24  Andrew Innes  <andrewi@gnu.org>
 
 	* _emacs: Remove obsolete file.
diff --git a/nt/configure.bat b/nt/configure.bat
index 4fd8ea549bd..5ef56136469 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -202,7 +202,16 @@ echo Checking whether W32 API headers are too old...
 echo #include "windows.h" >junk.c
 echo test(PIMAGE_NT_HEADERS pHeader) >>junk.c
 echo {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} >>junk.c
-gcc -c junk.c
+if (%nocygwin%) == (Y) goto checkw32api1
+set cf=%usercflags%
+goto checkw32api2
+:checkw32api1
+set cf=%usercflags% -mno-cygwin
+:checkw32api2
+echo on
+gcc %cf% -c junk.c
+echo off
+set cf=
 if exist junk.o goto gccOk
 
 :nocompiler