diff --git a/ChangeLog b/ChangeLog
index 65d32e29f..a996c46b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-27  Tor Lillqvist  <tml@novell.com>
+
+	* config.h.win32.in: Should not define HAVE_DIRENT_H when
+	compiling with MSVC, as the only file which checks HAVE_DIRENT_H
+	is gdir.c, and that includes the dirent.h and wdirent.c from
+	build/win32/dirent explicitly anyway when being compiled with
+	MSVC.
+
 2008-08-22  Björn Lindqvist  <bjourne@gmail.com>
 
 	Bug 523939 – Example program for GValue
diff --git a/config.h.win32.in b/config.h.win32.in
index d9ee35183..78ed09474 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -154,7 +154,11 @@
 #define HAVE_DCGETTEXT 1
 
 /* Define to 1 if you have the <dirent.h> header file. */
+#ifndef _MSC_VER
 #define HAVE_DIRENT_H 1
+#else
+/* #undef HAVE_DIRENT_H */
+#endif
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 /* #undef HAVE_DLFCN_H */