diff --git a/CMakeModules/cpack_custom.cmake b/CMakeModules/cpack_custom.cmake
index 650fd53..6a23457 100644
--- a/CMakeModules/cpack_custom.cmake
+++ b/CMakeModules/cpack_custom.cmake
@@ -78,6 +78,8 @@ endif()
 # Set "correct" filename that also include system version.
 if (CPACK_SYSTEM_VERSION)
 	set( CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}_${CPACK_SYSTEM_NAME}-${CPACK_SYSTEM_VERSION}_${CPACK_SYSTEM_ARCH}" )
+else()
+	set( CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}_${CPACK_SYSTEM_NAME}_${CPACK_SYSTEM_ARCH}" )
 endif()