diff --git a/mingw-w64-crt/revstamp.h b/mingw-w64-crt/revstamp.h
index f7eea6b..12d98aa 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	"4984"
-#define __MINGW_W64_REV_STAMP "2012-05-08"
+#define __MINGW_W64_REV	"4986"
+#define __MINGW_W64_REV_STAMP "2012-05-09"
 
diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index fc906dd..a4b557a 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-09  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* winuser.h (MAPVK_VK_TO_*): Moved map types for MapVirtualKeyEx
+	out of win7 ifdefs. Protected MAPVK_VK_TO_VSC_EX for vista-only.
+	* winuser.h (HTOUCHINPUT): Added new declaration (merged trunk
+	rev. 4810 by cjacek.)
+
 2012-05-08  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* uxtheme.h (MAX_INTLIST_COUNT): Define as 402 instead of 10 for
diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h
index 13e9eed..27e9f95 100644
--- a/mingw-w64-headers/include/winuser.h
+++ b/mingw-w64-headers/include/winuser.h
@@ -5295,6 +5295,14 @@
 #define RIDEV_EXMODEMASK 0x000000F0
 #define RIDEV_EXMODE(mode) ((mode) & RIDEV_EXMODEMASK)
 
+#define MAPVK_VK_TO_VSC    0
+#define MAPVK_VSC_TO_VK    1
+#define MAPVK_VK_TO_CHAR   2
+#define MAPVK_VSC_TO_VK_EX 3
+#if (_WIN32_WINNT >= 0x0600)
+#define MAPVK_VK_TO_VSC_EX 4
+#endif
+
 #if (_WIN32_WINNT >= 0x0601)
 #define WM_TOUCHMOVE 576
 #define WM_TOUCHDOWN 577
@@ -5313,11 +5321,7 @@
 #define TOUCHINPUTMASKF_EXTRAINFO       0x0002
 #define TOUCHINPUTMASKF_CONTACTAREA     0x0004
 
-#define MAPVK_VK_TO_VSC    0
-#define MAPVK_VSC_TO_VK    1
-#define MAPVK_VK_TO_CHAR   2
-#define MAPVK_VSC_TO_VK_EX 3
-#define MAPVK_VK_TO_VSC_EX 4
+DECLARE_HANDLE(HTOUCHINPUT);
 
   typedef struct _TOUCHINPUT {
     LONG x;
@@ -5338,7 +5342,7 @@
   WINUSERAPI WINBOOL WINAPI RegisterTouchWindow(HWND hWnd,ULONG ulFlags);
   WINUSERAPI WINBOOL WINAPI UnregisterTouchWindow(HWND hWnd);
 
-#endif
+#endif /* (_WIN32_WINNT >= 0x0601) */
 
   WINUSERAPI WINBOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE pRawInputDevices,UINT uiNumDevices,UINT cbSize);
   WINUSERAPI UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE pRawInputDevices,PUINT puiNumDevices,UINT cbSize);