diff --git a/ChangeLog b/ChangeLog
index 67adb780a..a973b586e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/x86_64/types.h: Define sizeof (long) as 4 when compiling
+	with mingw.
+
 2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/efi/api.h: Don't use call wrappers when compiled with
diff --git a/include/grub/x86_64/types.h b/include/grub/x86_64/types.h
index d53138ea3..fec910952 100644
--- a/include/grub/x86_64/types.h
+++ b/include/grub/x86_64/types.h
@@ -23,7 +23,11 @@
 #define GRUB_TARGET_SIZEOF_VOID_P	8
 
 /* The size of long.  */
+#ifdef __MINGW32__
+#define GRUB_TARGET_SIZEOF_LONG		4
+#else
 #define GRUB_TARGET_SIZEOF_LONG		8
+#endif
 
 /* x86_64 is little-endian.  */
 #undef GRUB_TARGET_WORDS_BIGENDIAN