diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c272aa107..4c0707eb9 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-11  Chris Sutcliffe  <ir0nh34d@users.sf.net>
+
+	* include/shlwapi.h (ASSOCSTR): Update enum.
+
 2008-09-07  Chris Sutcliffe  <ir0nh34d@users.sf.net>
 
 	* include/w32api.h: Increment version to 3.12.
diff --git a/winsup/w32api/include/shlwapi.h b/winsup/w32api/include/shlwapi.h
index 0ffe29f72..aaa01e757 100644
--- a/winsup/w32api/include/shlwapi.h
+++ b/winsup/w32api/include/shlwapi.h
@@ -58,7 +58,7 @@ typedef struct _DLLVERSIONINFO2
          ((ULONGLONG)(  qfe) <<  0))
 
 typedef enum {
-    ASSOCSTR_COMMAND,
+    ASSOCSTR_COMMAND = 1,
     ASSOCSTR_EXECUTABLE,
     ASSOCSTR_FRIENDLYDOCNAME,
     ASSOCSTR_FRIENDLYAPPNAME,
@@ -67,7 +67,16 @@ typedef enum {
     ASSOCSTR_DDECOMMAND,
     ASSOCSTR_DDEIFEXEC,
     ASSOCSTR_DDEAPPLICATION,
-    ASSOCSTR_DDETOPIC
+    ASSOCSTR_DDETOPIC,
+    ASSOCSTR_INFOTIP
+#ifdef _WIN32_IE >= 0x0600
+    ,
+    ASSOCSTR_QUICKTIP,
+    ASSOCSTR_TILEINFO,
+    ASSOCSTR_CONTENTTYPE,
+    ASSOCSTR_DEFAULTICON,
+    ASSOCSTR_SHELLEXTENSION
+#endif
 } ASSOCSTR;
 typedef enum
 {