diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 8e08c8801..336089b3c 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -229,10 +229,17 @@ set(CPACK_PACKAGE_VENDOR "Leon Styhre")
 # Update this when there has been a new release.
 set(CPACK_PACKAGE_VERSION "1.0.0-rc-dev")
 
+# Use the shorter x64 descriptor if on the x86_64/AMD64 architecture.
+if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL AMD64)
+    set(CPU_ARCHITECTURE "x64")
+else()
+    set(CPU_ARCHITECTURE "${CMAKE_HOST_SYSTEM_PROCESSOR}")
+endif()
+
 # Settings per operating system and generator type.
 if(APPLE)
     set(CPACK_GENERATOR "Bundle")
-    set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}")
+    set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}")
     set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns")
     set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}")
     set(CPACK_DMG_DS_STORE "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_DS_Store")
@@ -241,7 +248,7 @@ if(APPLE)
     set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist")
 elseif(WIN32)
     set(CPACK_GENERATOR "NSIS")
-    set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}")
+    set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}")
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "EmulationStation-DE")
     set(CPACK_PACKAGE_EXECUTABLES "EmulationStation" "EmulationStation")
     set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
@@ -258,7 +265,7 @@ else()
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "emulationstation_${CMAKE_PACKAGE_VERSION}")
     set(CPACK_PACKAGE_EXECUTABLES "emulationstation" "emulationstation")
     set(CPACK_GENERATOR "DEB")
-    set(CPACK_DEBIAN_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}.deb")
+    set(CPACK_DEBIAN_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.deb")
     set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Leon Styhre <leon@leonstyhre.com>")
     set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://es-de.org")
     set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
@@ -268,7 +275,7 @@ else()
 
     # Uncomment the next line to generate .rpm packages.
     #set(CPACK_GENERATOR "RPM")
-    set(CPACK_RPM_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}.rpm")
+    set(CPACK_RPM_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.rpm")
     set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
     set(CPACK_RPM_PACKAGE_LICENSE "MIT")
     set(CPACK_RPM_PACKAGE_REQUIRES "vlc")