diff --git a/deps/OCCT/OCCT.cmake b/deps/OCCT/OCCT.cmake
index 9981ac15e..7b8a57a56 100644
--- a/deps/OCCT/OCCT.cmake
+++ b/deps/OCCT/OCCT.cmake
@@ -20,3 +20,7 @@ prusaslicer_add_cmake_project(OCCT
 		-DBUILD_MODULE_ModelingData=OFF
 		-DBUILD_MODULE_Visualization=OFF
 )
+
+if (MSVC)
+    add_debug_dep(dep_OCCT)
+endif ()
diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
index ed75531a9..8ab9fb4be 100644
--- a/src/occt_wrapper/CMakeLists.txt
+++ b/src/occt_wrapper/CMakeLists.txt
@@ -50,6 +50,8 @@ set(OCCT_LIBS
     TKernel
 )
 
+slic3r_remap_configs("${OCCT_LIBS}" RelWithDebInfo Release)
+
 target_include_directories(OCCTWrapper PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(OCCTWrapper PUBLIC ${OpenCASCADE_INCLUDE_DIR})
 target_link_libraries(OCCTWrapper ${OCCT_LIBS})