diff --git a/cmake/packages.cmake b/cmake/packages.cmake
index a6701545..648f5591 100644
--- a/cmake/packages.cmake
+++ b/cmake/packages.cmake
@@ -30,10 +30,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     endif()
 endif()
 
-# Overwrite CMAKE_SYSTEM_PROCESSOR for Windows (visual)
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
+set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
+
+# Overwrite CPACK_SYSTEM_PROCESSOR for Windows (visual)
+if(${CPACK_SYSTEM_PROCESSOR} MATCHES "AMD64")
     if(${CMAKE_HOST_WIN32})
-        set(CMAKE_SYSTEM_PROCESSOR "x64")
+        set(CPACK_SYSTEM_PROCESSOR "x64")
     endif()
 endif()
 
@@ -46,7 +48,7 @@ SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" )
 
 # Replease "+", as cmake/rpm has an issue if "+" occurs in CPACK_PACKAGE_VERSION
 string(REPLACE "+" "." HYPERION_PACKAGE_VERSION ${HYPERION_VERSION})
-SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+SET ( CPACK_PACKAGE_FILE_NAME "Hyperion-${HYPERION_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}-${CPACK_SYSTEM_PROCESSOR}")
 
 SET ( CPACK_PACKAGE_CONTACT "packages@hyperion-project.org")
 SET ( CPACK_PACKAGE_VENDOR "hyperion-project")