diff --git a/ChangeLog b/ChangeLog
index b3c8b819..f0f855a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-06-20  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
+	* test/raw_decode.c (XMD_H): Avoid conflicting typedefs for INT32
+	and boolean in MinGW build due to including jpeglib.h.
+
 	* test/rewrite_tag.c (main): Fix problem with location of variable
 	declaration.
 
diff --git a/test/raw_decode.c b/test/raw_decode.c
index 6d31eab9..5e95a6f5 100644
--- a/test/raw_decode.c
+++ b/test/raw_decode.c
@@ -1,4 +1,4 @@
-/* $Id: raw_decode.c,v 1.5 2012-12-20 18:08:07 tgl Exp $ */
+/* $Id: raw_decode.c,v 1.6 2015-06-20 16:52:25 bfriesen Exp $ */
 
 /*
  * Copyright (c) 2012, Frank Warmerdam <warmerdam@pobox.com>
@@ -41,7 +41,13 @@
 #endif 
 
 #include "tiffio.h"
-
+/*
+  Avoid conflicting typedefs for INT32 and boolean when including jpeglib.h.
+*/
+#if defined(__MINGW32__)
+# define XMD_H 1
+# define HAVE_BOOLEAN /* Needs to match statement in jconfig.h */
+#endif
 #include "jpeglib.h" /* Needed for JPEG_LIB_VERSION */
 
 static unsigned char cluster_0[] = { 0, 0, 2, 0, 138, 139 };