diff --git a/ChangeLog b/ChangeLog
index ceae2029..9a804188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,8 @@ Thom Johansen
 Thibault LeMeur
 Pieter Palmers
 Tom Szilagyi
-Andrzej Szombierski 
+Andrzej Szombierski 
+Kjetil S.Matheussen
 
 ---------------------------
   Jackdmp changes log
@@ -16,7 +17,8 @@ Andrzej Szombierski
 
 2007-11-05 Stephane Letz  <letz@grame.fr>
 
-	* Use of JackWinSemaphore instead of JackWinEvent for inter-process synchronization.
+	* Use of JackWinSemaphore instead of JackWinEvent for inter-process synchronization.
+	* Correct types.h for use with MINGW on Windows.
 
 2007-11-04 Stephane Letz  <letz@grame.fr>
 
diff --git a/common/jack/types.h b/common/jack/types.h
index 82c3fbd3..a0d3a81c 100644
--- a/common/jack/types.h
+++ b/common/jack/types.h
@@ -22,17 +22,21 @@
 #define __jack_types_h__
 
 #ifdef WIN32
-	#include <windows.h>
-	typedef char int8_t;
-	typedef unsigned char uint8_t;
-	typedef short int16_t;
-	typedef unsigned short uint16_t;
-	typedef long int32_t;
-	typedef unsigned long uint32_t;
-	typedef LONGLONG int64_t;
-	typedef ULONGLONG uint64_t;
+#include <windows.h>
+#ifndef __MINGW32__
+typedef long int32_t;
+typedef unsigned long uint32_t;
 #else
-	#include <inttypes.h>
+#include <stdint.h>
+#endif
+typedef char int8_t;
+typedef unsigned char uint8_t;
+typedef short int16_t;
+typedef unsigned short uint16_t;
+typedef LONGLONG int64_t;
+typedef ULONGLONG uint64_t;
+#else
+#include <inttypes.h>
 #endif
 
 typedef int32_t jack_shmsize_t;