diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1de595e7a..ff003a525 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -797,7 +797,8 @@ IF(MSVC)
 	set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}")
 	# set linker flag /nodefaultlib
 	set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB")
-	SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB")
+	set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /NODEFAULTLIB")
+	set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB")
 	IF(FREECAD_RELEASE_PDB)
 		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
 		set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
diff --git a/cMake/UseLibPack10x.cmake b/cMake/UseLibPack10x.cmake
index 0fb8ddf18..d4b789922 100644
--- a/cMake/UseLibPack10x.cmake
+++ b/cMake/UseLibPack10x.cmake
@@ -30,6 +30,7 @@ set(Boost_LIBRARIES
     optimized boost_system-vc110-mt-1_55.lib 
     optimized boost_graph-vc110-mt-1_55.lib 
     optimized boost_program_options-vc110-mt-1_55.lib
+    optimized boost_python-vc110-mt-1_55.lib
     optimized boost_regex-vc110-mt-1_55.lib
     optimized boost_signals-vc110-mt-1_55.lib
     optimized boost_thread-vc110-mt-1_55.lib
@@ -37,6 +38,7 @@ set(Boost_LIBRARIES
     debug boost_system-vc110-mt-gd-1_55.lib
     debug boost_graph-vc110-mt-gd-1_55.lib 
     debug boost_program_options-vc110-mt-gd-1_55.lib
+    debug boost_python-vc110-mt-gd-1_55.lib
     debug boost_regex-vc110-mt-gd-1_55.lib
     debug boost_signals-vc110-mt-gd-1_55.lib
     debug boost_thread-vc110-mt-gd-1_55.lib
diff --git a/cMake/UseLibPack6x.cmake b/cMake/UseLibPack6x.cmake
index f61cc1951..5af8cbae9 100644
--- a/cMake/UseLibPack6x.cmake
+++ b/cMake/UseLibPack6x.cmake
@@ -29,11 +29,13 @@ set(Boost_LIBRARIES
 	optimized boost_filesystem-vc80-mt.lib 
 	#optimized boost_graph-vc80-mt.lib 
 	optimized boost_program_options-vc80-mt.lib
+	optimized boost_python-vc80-mt.lib
 	optimized boost_regex-vc80-mt.lib
 	optimized boost_signals-vc80-mt.lib
 	debug boost_filesystem-vc80-mt-gd.lib 
 	#debug boost_graph-vc80-mt-gd.lib 
 	debug boost_program_options-vc80-mt-gd.lib
+	debug boost_python-vc80-mt-gd.lib
 	debug boost_regex-vc80-mt-gd.lib
 	debug boost_signals-vc80-mt-gd.lib
 )
diff --git a/cMake/UseLibPack7x.cmake b/cMake/UseLibPack7x.cmake
index c155fc966..36e51e64a 100644
--- a/cMake/UseLibPack7x.cmake
+++ b/cMake/UseLibPack7x.cmake
@@ -30,6 +30,7 @@ set(Boost_LIBRARIES
     optimized boost_system-vc90-mt-1_39.lib 
 	optimized boost_graph-vc90-mt-1_39.lib 
 	optimized boost_program_options-vc90-mt-1_39.lib
+	optimized boost_python-vc90-mt-1_39.lib
 	optimized boost_regex-vc90-mt-1_39.lib
 	optimized boost_signals-vc90-mt-1_39.lib
 	optimized boost_thread-vc90-mt-1_39.lib
@@ -43,6 +44,7 @@ set(Boost_LIBRARIES
 	debug boost_system-vc90-mt-gd-1_39.lib
 	debug boost_graph-vc90-mt-gd-1_39.lib 
 	debug boost_program_options-vc90-mt-gd-1_39.lib
+	debug boost_python-vc90-mt-gd-1_39.lib
 	debug boost_regex-vc90-mt-gd-1_39.lib
 	debug boost_signals-vc90-mt-gd-1_39.lib
 )
diff --git a/cMake/UseLibPack8x.cmake b/cMake/UseLibPack8x.cmake
index 3609b9d1d..0047aeee1 100644
--- a/cMake/UseLibPack8x.cmake
+++ b/cMake/UseLibPack8x.cmake
@@ -30,6 +30,7 @@ set(Boost_LIBRARIES
     optimized boost_system-vc90-mt-1_48.lib 
 	optimized boost_graph-vc90-mt-1_48.lib 
 	optimized boost_program_options-vc90-mt-1_48.lib
+	optimized boost_python-vc90-mt-1_48.lib
 	optimized boost_regex-vc90-mt-1_48.lib
 	optimized boost_signals-vc90-mt-1_48.lib
 	optimized boost_thread-vc90-mt-1_48.lib
@@ -43,6 +44,7 @@ set(Boost_LIBRARIES
 	debug boost_system-vc90-mt-gd-1_48.lib
 	debug boost_graph-vc90-mt-gd-1_48.lib 
 	debug boost_program_options-vc90-mt-gd-1_48.lib
+	debug boost_python-vc90-mt-gd-1_48.lib
 	debug boost_regex-vc90-mt-gd-1_48.lib
 	debug boost_signals-vc90-mt-gd-1_48.lib
 )
diff --git a/cMake/UseLibPack9x.cmake b/cMake/UseLibPack9x.cmake
index f2428b0f1..974a6ad00 100644
--- a/cMake/UseLibPack9x.cmake
+++ b/cMake/UseLibPack9x.cmake
@@ -30,6 +30,7 @@ set(Boost_LIBRARIES
     optimized boost_system-vc90-mt-1_54.lib 
     optimized boost_graph-vc90-mt-1_54.lib 
     optimized boost_program_options-vc90-mt-1_54.lib
+    optimized boost_python-vc90-mt-1_54.lib
     optimized boost_regex-vc90-mt-1_54.lib
     optimized boost_signals-vc90-mt-1_54.lib
     optimized boost_thread-vc90-mt-1_54.lib
@@ -37,6 +38,7 @@ set(Boost_LIBRARIES
     debug boost_system-vc90-mt-gd-1_54.lib
     debug boost_graph-vc90-mt-gd-1_54.lib 
     debug boost_program_options-vc90-mt-gd-1_54.lib
+    debug boost_python-vc90-mt-gd-1_54.lib
     debug boost_regex-vc90-mt-gd-1_54.lib
     debug boost_signals-vc90-mt-gd-1_54.lib
     debug boost_thread-vc90-mt-gd-1_54.lib
diff --git a/cMake/UseLibPackCustom.cmake b/cMake/UseLibPackCustom.cmake
index 1ec0bb51e..46a46ac36 100644
--- a/cMake/UseLibPackCustom.cmake
+++ b/cMake/UseLibPackCustom.cmake
@@ -30,6 +30,7 @@ set(Boost_LIBRARIES
     optimized boost_system-vc90-mt-1_41.lib 
 	optimized boost_graph-vc90-mt-1_41.lib 
 	optimized boost_program_options-vc90-mt-1_41.lib
+	optimized boost_python-vc90-mt-1_41.lib
 	optimized boost_regex-vc90-mt-1_41.lib
 	optimized boost_signals-vc90-mt-1_41.lib
 	optimized boost_thread-vc90-mt-1_41.lib
@@ -37,6 +38,7 @@ set(Boost_LIBRARIES
 	debug boost_system-vc90-mt-gd-1_41.lib
 	debug boost_graph-vc90-mt-gd-1_41.lib 
 	debug boost_program_options-vc90-mt-gd-1_41.lib
+	debug boost_python-vc90-mt-gd-1_41.lib
 	debug boost_regex-vc90-mt-gd-1_41.lib
 	debug boost_signals-vc90-mt-gd-1_41.lib
 	debug boost_thread-vc90-mt-gd-1_41.lib
diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt
index 8af483026..4841ea7e5 100644
--- a/src/Mod/Path/libarea/CMakeLists.txt
+++ b/src/Mod/Path/libarea/CMakeLists.txt
@@ -66,7 +66,29 @@ add_library(
   ${PYAREA_SRC}
 )
 
-target_link_libraries(area ${Boost_LIBRARIES})
+if(MSVC)
+    set(area_LIBS
+        ${Boost_LIBRARIES}
+        ${PYTHON_LIBRARIES}
+        debug MSVCRTD.LIB
+        debug MSVCPRTD.LIB
+        optimized MSVCRT.LIB
+        optimized MSVCPRT.LIB
+    )
+elseif(MINGW)
+    set(area_LIBS
+        ${Boost_LIBRARIES}
+        ${PYTHON_LIBRARIES}
+        Rpcrt4.lib
+    )
+else(MSVC)
+    set(area_LIBS
+        ${Boost_LIBRARIES}
+        ${PYTHON_LIBRARIES}
+    )
+endif(MSVC)
+
+target_link_libraries(area ${area_LIBS})
 
 SET_BIN_DIR(area area)
 SET_PYTHON_PREFIX_SUFFIX(area)