diff --git a/gcc.cmake b/gcc.cmake
index 14e10d68e07..80fe006eeed 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -93,6 +93,10 @@ macro(set_module_type MODULE TYPE)
     if(${TYPE} MATCHES win32dll)
         set_entrypoint(${MODULE} DllMain@12)
     endif()
+    if(${TYPE} MATCHES win32ocx)
+        set_entrypoint(${MODULE} DllMain@12)
+        set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")
+    endif()
 endmacro()
 
 endif()
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index b8b49d20347..7eb136d2f20 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -38,7 +38,8 @@ MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES)
 set(CMAKE_CXX_STANDARD_LIBRARIES "")
 
 if(ARCH MATCHES i386)
-set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at")
+#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
 elseif(ARCH MATCHES amd64)
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at")
 endif(ARCH MATCHES i386)