diff --git a/reactos/dll/win32/comcat/CMakeLists.txt b/reactos/dll/win32/comcat/CMakeLists.txt
index 969a6c3dc8c..dcc2fde4689 100644
--- a/reactos/dll/win32/comcat/CMakeLists.txt
+++ b/reactos/dll/win32/comcat/CMakeLists.txt
@@ -1,25 +1,14 @@
 
 add_definitions(-D__WINESRC__)
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(comcat.dll comcat.spec)
 
 list(APPEND SOURCE
     comcat_main.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
 
-add_library(comcat SHARED ${SOURCE})
-
+add_library(comcat SHARED ${SOURCE} version.rc)
 set_module_type(comcat win32dll)
-
-target_link_libraries(comcat uuid wine)
-
-add_importlibs(comcat msvcrt ole32 user32 advapi32 kernel32 ntdll)
-
-add_dependencies(comcat psdk)
+add_importlibs(comcat ole32 msvcrt kernel32)
 add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/comcat/comcat_main.c b/reactos/dll/win32/comcat/comcat_main.c
index 5a76aec16f5..9417b0be2d2 100644
--- a/reactos/dll/win32/comcat/comcat_main.c
+++ b/reactos/dll/win32/comcat/comcat_main.c
@@ -22,14 +22,8 @@
 
 //#include <stdarg.h>
 
-#define COBJMACROS
-
 #include <windef.h>
 //#include "winbase.h"
-//#include "winuser.h"
-//#include "winreg.h"
-//#include "winerror.h"
-//#include "ole2.h"
 
 /***********************************************************************
  *		DllCanUnloadNow (COMCAT.@)
diff --git a/reactos/dll/win32/comcat/version.rc b/reactos/dll/win32/comcat/version.rc
index a0f91de52b1..1d5d15e0ce4 100644
--- a/reactos/dll/win32/comcat/version.rc
+++ b/reactos/dll/win32/comcat/version.rc
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILENAME_STR "comcat.dll"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include <wine/wine_common_ver.rc>
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 1af030eca9b..ac7289ee499 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -58,7 +58,7 @@ reactos/dll/win32/bcrypt          # Synced to Wine-1.5.26
 reactos/dll/win32/browseui        # Out of sync
 reactos/dll/win32/cabinet         # Synced to Wine-1.5.26
 reactos/dll/win32/clusapi         # Synced to Wine-1.7.1
-reactos/dll/win32/comcat          # Synced to Wine-1.5.4
+reactos/dll/win32/comcat          # Synced to Wine-1.7.1
 reactos/dll/win32/comctl32        # Synced to Wine 1.5.26
 reactos/dll/win32/comdlg32        # Synced to Wine 1.3.37
 reactos/dll/win32/compstui        # Synced to Wine-1.5.19