diff --git a/ChangeLog b/ChangeLog
index 9b3ce3d0e..13cba9014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-08  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSBitmapImageRep+JPEG.m: Define HAVE_BOOLEAN to avoid
+	problem with jmorecfg.h header on mingw.
+
 2008-05-07  Adam Fedor  <fedor@gnu.org>
 
 	* Source/NSSplitView.m (-adjustSubviews): Just return if there
diff --git a/Source/NSBitmapImageRep+JPEG.m b/Source/NSBitmapImageRep+JPEG.m
index 9ec900475..85fd27e45 100644
--- a/Source/NSBitmapImageRep+JPEG.m
+++ b/Source/NSBitmapImageRep+JPEG.m
@@ -44,6 +44,10 @@
 #ifndef XMD_H
 #define XMD_H
 #endif
+/* And another so that boolean is not redefined in jmorecfg.h. */
+#ifndef HAVE_BOOLEAN
+#define HAVE_BOOLEAN
+#endif
 #endif
 #include <jpeglib.h>