diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index b071ee8..f7eea6b 100644
--- a/mingw-w64-crt/revstamp.h
+++ b/mingw-w64-crt/revstamp.h
@@ -1,4 +1,4 @@
 /* Do not edit. Autogenerated.  */
-#define __MINGW_W64_REV	"4981"
-#define __MINGW_W64_REV_STAMP "2012-05-07"
+#define __MINGW_W64_REV	"4984"
+#define __MINGW_W64_REV_STAMP "2012-05-08"
 
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 7808c25..fc906dd 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-08  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* uxtheme.h (MAX_INTLIST_COUNT): Define as 402 instead of 10 for
+	vista and newer. (bug #3524667).
+
 2012-05-07  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* dwmapi.h: Fixed all function prototypes to be WINAPI.
diff --git a/mingw-w64-headers/include/uxtheme.h b/mingw-w64-headers/include/uxtheme.h
index 04f2516..afef209 100644
--- a/mingw-w64-headers/include/uxtheme.h
+++ b/mingw-w64-headers/include/uxtheme.h
@@ -105,7 +105,11 @@
 
 THEMEAPI GetThemeMargins(HTHEME hTheme,HDC hdc,int iPartId,int iStateId,int iPropId,RECT *prc,MARGINS *pMargins);
 
+#if (_WIN32_WINNT >= 0x0600)
+#define MAX_INTLIST_COUNT 402
+#else
 #define MAX_INTLIST_COUNT 10
+#endif
 
 typedef struct _INTLIST {
   int iValueCount;