diff --git a/ChangeLog b/ChangeLog
index ed7c06d5c..aa2299c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2009-06-11  Pavel Roskin  <proski@gnu.org>
+
+	* configure.ac: Always define ___main if using -nostdlib.  This
+	fixes tests on Cygwin.
+
 2009-06-11  Giuseppe Caizzone  <acaizzo@gmail.com>
 
 	UDF fix
 
-	* fs/udf.c (grub_udf_read_block): handle the fact that ad->length 
+	* fs/udf.c (grub_udf_read_block): handle the fact that ad->length
 	is in bytes and not in blocks
-	
+
 2009-06-11  Pavel Roskin  <proski@gnu.org>
 
 	* kern/i386/halt.c (grub_halt): Make `i' unsigned to fix a
diff --git a/configure.ac b/configure.ac
index ca8c265d1..b0f7bb728 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,7 +396,7 @@ AC_SUBST(TARGET_LDFLAGS)
 
 # Set them to their new values for the tests below.
 CC="$TARGET_CC"
-CFLAGS="$TARGET_CFLAGS -nostdlib"
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
 CPPFLAGS="$TARGET_CPPFLAGS"
 LDFLAGS="$TARGET_LDFLAGS"