diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 8fa373ad5..0ec3b0d77 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-10 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
+
+	* include/_mingw.h: Increment version to 3.15.2.
+
 2009-01-04  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
 	Fix MinGW-Bug [2445962]; (reported by Keishi Suenaga).
@@ -99,7 +103,6 @@
 	* include/stdlib.h (strtod): Declare as `__inline__', not `inline';
 	reformat inline function definition.
 
->>>>>>> 1.423
 2008-10-04 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
 
 	* include/_mingw.h: Increment version to 3.15.1 and introduce
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index ec91c6c52..22da4c953 100644
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -22,10 +22,10 @@
  */
 #define __MINGW_H
 
-#define __MINGW32_VERSION           3.15.1
+#define __MINGW32_VERSION           3.15.2
 #define __MINGW32_MAJOR_VERSION     3
 #define __MINGW32_MINOR_VERSION     15
-#define __MINGW32_PATCHLEVEL        1
+#define __MINGW32_PATCHLEVEL        2
 
 #if __GNUC__ >= 3
 #pragma GCC system_header