diff --git a/reactos/dll/win32/comctl32/resource.h b/reactos/dll/win32/comctl32/resource.h
index 877210d3660..0b027cb500f 100644
--- a/reactos/dll/win32/comctl32/resource.h
+++ b/reactos/dll/win32/comctl32/resource.h
@@ -59,4 +59,7 @@
 #define IDI_TT_WARN_SM                   25
 #define IDI_TT_ERROR_SM                  28
 
-#define COMCTL32_VERSION_MINOR 81
+// This is really ComCtl32 v5.82, the last one not supporting SxS
+#undef  COMCTL32_VERSION // Undefines what the PSDK gave to us
+#define COMCTL32_VERSION        5
+#define COMCTL32_VERSION_MINOR 82
diff --git a/reactos/dll/win32/comctl32/rsrc.rc b/reactos/dll/win32/comctl32/rsrc.rc
index eb4d06da726..650f77203da 100644
--- a/reactos/dll/win32/comctl32/rsrc.rc
+++ b/reactos/dll/win32/comctl32/rsrc.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define WINE_FILEDESCRIPTION_STR "Wine Common Controls"
 #define WINE_FILENAME_STR "comctl32.dll"
 #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100
-#define WINE_FILEVERSION_STR "5.81"
+#define WINE_FILEVERSION_STR "5.82"
 #define WINE_PRODUCTVERSION WINE_FILEVERSION
 #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
 
diff --git a/reactos/include/psdk/commctrl.h b/reactos/include/psdk/commctrl.h
index 61f770bbadf..9835912be50 100644
--- a/reactos/include/psdk/commctrl.h
+++ b/reactos/include/psdk/commctrl.h
@@ -102,7 +102,12 @@ extern "C" {
     COLORREF clrBtnShadow;
   } COLORSCHEME,*LPCOLORSCHEME;
 
-#define COMCTL32_VERSION 6
+#if (_WIN32_IE >= 0x0500)
+#if (_WIN32_WINNT >= 0x0501)
+#define COMCTL32_VERSION  6
+#else
+#define COMCTL32_VERSION  5
+#endif
 
 #define CCM_SETVERSION (CCM_FIRST+0x7)
 #define CCM_GETVERSION (CCM_FIRST+0x8)