diff --git a/VersionResource.rc b/VersionResource.rc
index d2b0772..3471b95 100644
--- a/VersionResource.rc
+++ b/VersionResource.rc
@@ -1,4 +1,4 @@
-#include "VersionInfo.h"
+#include "@PRODUCT_VERSION_HEADER@"
 
 #if defined(__MINGW64__) || defined(__MINGW32__)
 	// MinGW-w64, MinGW
diff --git a/generate_product_version.cmake b/generate_product_version.cmake
index 5e992dd..c76c22f 100644
--- a/generate_product_version.cmake
+++ b/generate_product_version.cmake
@@ -92,8 +92,9 @@ function(generate_product_version outfiles)
         set(PRODUCT_FILE_DESCRIPTION "${PRODUCT_NAME}")
     endif()
 
-    set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.h)
-    set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/VersionResource.rc)
+    set (_VersionInfoFile ${CMAKE_CURRENT_BINARY_DIR}/${PRODUCT_NAME}_VersionInfo.h)
+    set (_VersionResourceFile ${CMAKE_CURRENT_BINARY_DIR}/${PRODUCT_NAME}_VersionResource.rc)
+    set(PRODUCT_VERSION_HEADER ${_VersionInfoFile})
     configure_file(
         ${GenerateProductVersionCurrentDir}/VersionInfo.in
         ${_VersionInfoFile}
@@ -101,7 +102,7 @@ function(generate_product_version outfiles)
     configure_file(
         ${GenerateProductVersionCurrentDir}/VersionResource.rc
         ${_VersionResourceFile}
-        COPYONLY)
+        @ONLY)
     list(APPEND ${outfiles} ${_VersionInfoFile} ${_VersionResourceFile})
     set (${outfiles} ${${outfiles}} PARENT_SCOPE)
 endfunction()