diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76e5d45..0e50db4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,14 +115,16 @@ if(USE_LOG)
 endif()
 
 if(NOT BUILD_DEMO)
-    set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
     set(CPACK_WIX_UPGRADE_GUID E709D29C-1BD8-4679-A8CA-9D40567771F5)
     if(CMAKE_SYSTEM_NAME MATCHES Linux)
         set(CPACK_GENERATOR TGZ)
+        set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
     elseif(CMAKE_SYSTEM_NAME MATCHES Windows)
         set(CPACK_GENERATOR ZIP;WIX)
+        set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
     elseif(CMAKE_SYSTEM_NAME MATCHES Darwin)
         set(CPACK_GENERATOR ZIP;DragNDrop)
+        set(CPACK_SYSTEM_NAME macOS-${CMAKE_SYSTEM_PROCESSOR})
     endif()
     set(CPACK_PACKAGE_NAME  "Strange Adventures in Infinite Space GPL")
     set(CPACK_PACKAGE_FILE_NAME "SAIS-GPL-${CMAKE_PROJECT_VERSION}-${CPACK_SYSTEM_NAME}")