diff --git a/ChangeLog b/ChangeLog
index d0677969b..b0da624bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-24  Tor Lillqvist  <tml@novell.com>
+
+	* glibconfig.h.win32.in: Check also _WIN64.
+
 2008-07-24  Tor Lillqvist  <tml@novell.com>
 
 	* glibconfig.h.win32.in: Patch for 64-bit Windows from Richard
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 6bb0db6d0..426c582e6 100644
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -64,7 +64,7 @@ typedef unsigned __int64 guint64;
 #define G_GINT64_FORMAT "I64i"
 #define G_GUINT64_FORMAT "I64u"
 
-#if defined(_M_X64) || defined(_M_AMD64)
+#if defined(_WIN64) || defined(_M_X64) || defined(_M_AMD64)
 
 #define GLIB_SIZEOF_VOID_P 8
 #define GLIB_SIZEOF_LONG   4