diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3e4d7be49..4798befa12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,7 @@ endif ()
 set(ARANGODB_VERSION_MAJOR      "3")
 set(ARANGODB_VERSION_MINOR      "0")
 set(ARANGODB_VERSION_REVISION   "devel")
+set(ARANGODB_PACKAGE_REVISION   "1")
 
 set(ARANGODB_VERSION
     "${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}")
diff --git a/Installation/cmake/CMakeCPackOptions.cmake.in b/Installation/cmake/CMakeCPackOptions.cmake.in
index 83317d588f..0f3005b89d 100644
--- a/Installation/cmake/CMakeCPackOptions.cmake.in
+++ b/Installation/cmake/CMakeCPackOptions.cmake.in
@@ -1,9 +1,3 @@
-# debian
-if (CPACK_GENERATOR STREQUAL "DEB")
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-
-  set(CPACK_COMPONENTS_ALL debian-extras)
-endif ()
 
 # OSX bundle 
 if (CPACK_GENERATOR STREQUAL "Bundle")
diff --git a/cmake/packages/client/deb.txt b/cmake/packages/client/deb.txt
index 81fa99b22a..e1387a2146 100644
--- a/cmake/packages/client/deb.txt
+++ b/cmake/packages/client/deb.txt
@@ -26,6 +26,7 @@ set(ARANGODB_URL_INFO_ABOUT @ARANGODB_URL_INFO_ABOUT@)
 set(ARANGODB_SOURCE_DIR @ARANGODB_SOURCE_DIR@)
 set(ARANGODB_VERSION @ARANGODB_VERSION@)
 set(ARANGODB_PACKAGE_CONTACT @ARANGODB_PACKAGE_CONTACT@)
+set(ARANGODB_PACKAGE_REVISION @ARANGODB_PACKAGE_REVISION@)
 
 set(CMAKE_INSTALL_FULL_BINDIR @CMAKE_INSTALL_FULL_BINDIR@)
 set(CMAKE_TARGET_ARCHITECTURES @CMAKE_TARGET_ARCHITECTURES@)
@@ -36,26 +37,6 @@ set(CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO @CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO@)
 set(ORIGINAL_SOURCE_DIR @PROJECT_SOURCE_DIR@)
 set(PROJECT_SOURCE_DIR @PROJECT_SOURCE_DIR@)
 
-################################################################################
-# specify which target archcitecture the package is going to be:
-################################################################################
-if(CMAKE_TARGET_ARCHITECTURES MATCHES ".*x86_64.*")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
-elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "aarch64")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64")
-elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "armv7")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm7")
-else()
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
-endif()
-
-################################################################################
-# Install the external files into the package directory:
-################################################################################
-include(${ORIGINAL_SOURCE_DIR}/cmake/InstallMacros.cmake)
-include(${ORIGINAL_SOURCE_DIR}/cmake/InstallArangoDBJSClient.cmake)
-include(${ORIGINAL_SOURCE_DIR}/arangosh/install.cmake)
-
 ################################################################################
 # Get the final values for cpack:
 ################################################################################
@@ -67,8 +48,31 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, arangodb3")
 set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
+set(CPACK_COMPONENTS_ALL debian-extras)
 
 file(READ "${PROJECT_SOURCE_DIR}/Installation/debian/client_packagedesc.txt"
   CPACK_DEBIAN_PACKAGE_DESCRIPTION)
 
+################################################################################
+# specify which target archcitecture the package is going to be:
+################################################################################
+if(CMAKE_TARGET_ARCHITECTURES MATCHES ".*x86_64.*")
+  set(ARANGODB_PACKAGE_ARCHITECTURE "amd64")
+elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "aarch64")
+  set(ARANGODB_PACKAGE_ARCHITECTURE "arm64")
+elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "armv7")
+  set(ARANGODB_PACKAGE_ARCHITECTURE "arm7")
+else()
+  set(ARANGODB_PACKAGE_ARCHITECTURE "i386")
+endif()
+
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${ARANGODB_PACKAGE_REVISION}_${ARANGODB_PACKAGE_ARCHITECTURE}")
+
+################################################################################
+# Install the external files into the package directory:
+################################################################################
+include(${ORIGINAL_SOURCE_DIR}/cmake/InstallMacros.cmake)
+include(${ORIGINAL_SOURCE_DIR}/cmake/InstallArangoDBJSClient.cmake)
+include(${ORIGINAL_SOURCE_DIR}/arangosh/install.cmake)
+
 include(CPack)
diff --git a/cmake/packages/deb.cmake b/cmake/packages/deb.cmake
index 7c6e75a646..09873c465f 100644
--- a/cmake/packages/deb.cmake
+++ b/cmake/packages/deb.cmake
@@ -8,6 +8,7 @@ set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})
+set(CPACK_COMPONENTS_ALL debian-extras)
 
 list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
   "${PROJECT_SOURCE_DIR}/Installation/debian/templates"
@@ -18,14 +19,15 @@ list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
   "${PROJECT_SOURCE_DIR}/Installation/debian/prerm;")
 
 if(CMAKE_TARGET_ARCHITECTURES MATCHES ".*x86_64.*")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+  set(ARANGODB_PACKAGE_ARCHITECTURE "amd64")
 elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "aarch64")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64")
+  set(ARANGODB_PACKAGE_ARCHITECTURE "arm64")
 elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "armv7")
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm7")
+  set(ARANGODB_PACKAGE_ARCHITECTURE "arm7")
 else()
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
+  set(ARANGODB_PACKAGE_ARCHITECTURE "i386")
 endif()
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${ARANGODB_PACKAGE_REVISION}_${ARANGODB_PACKAGE_ARCHITECTURE}")
 
 
 # deploy the Init script: