diff --git a/bindings/flow/CMakeLists.txt b/bindings/flow/CMakeLists.txt
index e69bb340fa..272eab22da 100644
--- a/bindings/flow/CMakeLists.txt
+++ b/bindings/flow/CMakeLists.txt
@@ -36,7 +36,7 @@ if(NOT OPEN_FOR_IDE)
   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages)
   file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages)
   set(package_dir ${CMAKE_CURRENT_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION})
-  set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${prerelease_string}.tar.gz)
+  set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${prerelease_string}-x86_64.tar.gz)
   add_custom_command(OUTPUT ${tar_file}
     COMMAND
     ${CMAKE_COMMAND} -E make_directory ${package_dir} &&
diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index 8ddb1ba271..9a14e26819 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -266,20 +266,20 @@ configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_BINARY_DIR}/License.txt COPYO
 ################################################################################
 
 if(NOT FDB_RELEASE)
-  set(prerelease_string ".PRERELEASE")
+  if(CURRENT_GIT_VERSION)
+    set(git_string ".${CURRENT_GIT_VERSION}")
+  endif()
+  set(prerelease_string "${git_string}.PRERELEASE")
 endif()
 
-if(CURRENT_GIT_VERSION)
-  set(git_string ".${CURRENT_GIT_VERSION}")
-endif()
 
 # RPM filenames
-set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}-0${git_string}${prerelease_string}")
-set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}-0${git_string}${prerelease_string}")
+set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}-1${prerelease_string}")
+set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}-1${prerelease_string}")
 
 # Deb filenames
-set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}-0${git_string}${prerelease_string}")
-set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}-0${git_string}${prerelease_string}")
+set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}-0${prerelease_string}")
+set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}-0${prerelease_string}")
 
 ################################################################################
 # Configuration for RPM