diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt
index 05daf94b3..7227ad37a 100644
--- a/cmake_builder/linphone_package/CMakeLists.txt
+++ b/cmake_builder/linphone_package/CMakeLists.txt
@@ -165,7 +165,7 @@ if (WIN32)
     list(APPEND SHARE_CONTENT_EXCLUDE PATTERN "${ITEM}" EXCLUDE)
   endforeach ()
 
-  install(DIRECTORY "${LINPHONE_OUTPUT_DIR}"
+  install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/"
     DESTINATION "."
     PATTERN "bin/*_tester.exe" EXCLUDE
     PATTERN "bin/belcard*.exe" EXCLUDE
diff --git a/cmake_builder/linphone_package/windows/packaging.cmake.in b/cmake_builder/linphone_package/windows/packaging.cmake.in
index db639153a..ba0d113fa 100644
--- a/cmake_builder/linphone_package/windows/packaging.cmake.in
+++ b/cmake_builder/linphone_package/windows/packaging.cmake.in
@@ -22,7 +22,7 @@
 
 if (NOT "${CMAKE_INSTALL_PREFIX}" MATCHES .*/_CPack_Packages/.*)
   execute_process(
-    COMMAND ${CMAKE_CPACK_COMMAND} -G ${CPACK_GENERATOR}
+    COMMAND ${CMAKE_CPACK_COMMAND} -G @CPACK_GENERATOR@
     RESULT_VARIABLE CPACK_COMMAND_SUCCESS
   )