diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7c2703a2ed06dd47f4ff6c00159485420b907a3..760c62c2354354943ef7afb81061dee3257f4bf4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,8 @@ set(CPACK_PACKAGE_VERSION ${ASAPO_VERSION})
 set(CPACK_PACKAGE_RELEASE ${PACKAGE_RELEASE_SUFFIX})
 set(CPACK_PACKAGE_CONTACT "IT")
 set(CPACK_PACKAGE_VENDOR "DESY")
-set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+IF(NOT WIN32)
+    set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+endif()
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
 include(CPack)
diff --git a/common/cpp/CMakeLists.txt b/common/cpp/CMakeLists.txt
index 4ef322e2193f101c656ee38e36be7a7ebbf1c4e7..f59ad1bcf8f18acae4dc8da02ccd73eb654cb55d 100644
--- a/common/cpp/CMakeLists.txt
+++ b/common/cpp/CMakeLists.txt
@@ -19,14 +19,14 @@ if(NOT BUILD_CLIENTS_ONLY)
 endif()
 
 install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/common
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo
+        DESTINATION include/asapo
         PATTERN "*.h.in" EXCLUDE)
 
 install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/logger
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo )
+        DESTINATION include/asapo )
 
 install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/asapo_fabric
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo)
+        DESTINATION include/asapo)
 
 install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/preprocessor
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo)
+        DESTINATION include/asapo)