diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index bca4324d..263c5b88 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -19,19 +19,25 @@ pybind11_add_module(xlntpyarrowlib xlntpyarrow.lib.cpp)
 set_target_properties(xlntpyarrowlib PROPERTIES
 		OUTPUT_NAME "lib")
 
-if(MSVC)
-		target_compile_definitions(xlntpyarrowlib PRIVATE _CRT_SECURE_NO_WARNINGS=1)
-endif()
-
 target_include_directories(xlntpyarrowlib
   	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
   	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../source
   	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../third-party/pybind11/include
   	PRIVATE ${ARROW_INCLUDE_DIR})
 target_link_libraries(xlntpyarrowlib
-  	PRIVATE xlnt
-  	PRIVATE ${ARROW_SHARED_IMP_LIB}
-  	PRIVATE ${ARROW_PYTHON_SHARED_IMP_LIB})
+    PRIVATE xlnt)
+
+if(MSVC)
+    target_compile_definitions(xlntpyarrowlib
+        PRIVATE _CRT_SECURE_NO_WARNINGS=1)
+    target_link_libraries(xlntpyarrowlib
+      	PRIVATE ${ARROW_SHARED_IMP_LIB}
+      	PRIVATE ${ARROW_PYTHON_SHARED_IMP_LIB})
+else()
+    target_link_libraries(xlntpyarrowlib
+        PRIVATE ${ARROW_SHARED_LIB}
+        PRIVATE ${ARROW_PYTHON_SHARED_LIB})
+endif()
 
 if(NOT STATIC)
     add_custom_command(TARGET xlntpyarrowlib POST_BUILD
diff --git a/python/setup.py b/python/setup.py
index de4514a3..bccd9965 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -145,7 +145,7 @@ class build_ext(_build_ext):
         except OSError:
             pass
 
-        build_prefix = self.build_type
+        build_prefix = pjoin(['source'] + [self.build_type] if sys.platform == 'win32' else [])
 
         def move_lib(lib_name):
             lib_filename = (shared_library_prefix + lib_name +
@@ -211,7 +211,7 @@ class build_ext(_build_ext):
             return pjoin(head, self.build_type, tail + suffix)
         else:
             suffix = sysconfig.get_config_var('SO')
-            return pjoin(self.build_type, name + suffix)
+            return name + suffix
 
     def get_names(self):
         return self._found_names