diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake
index ae40c63d20..b361778e4d 100644
--- a/cmake/InstallLayout.cmake
+++ b/cmake/InstallLayout.cmake
@@ -160,7 +160,7 @@ endfunction()
 function(fdb_install)
   if(NOT WIN32 AND NOT OPEN_FOR_IDE)
     set(one_value_options COMPONENT DESTINATION EXPORT DESTINATION_SUFFIX)
-    set(multi_value_options TARGETS FILES DIRECTORY)
+    set(multi_value_options TARGETS FILES PROGRAMS DIRECTORY)
     cmake_parse_arguments(IN "${options}" "${one_value_options}" "${multi_value_options}" "${ARGN}")
 
     set(install_export 0)
@@ -168,12 +168,14 @@ function(fdb_install)
       set(args TARGETS ${IN_TARGETS})
     elseif(IN_FILES)
       set(args FILES ${IN_FILES})
+    elseif(IN_PROGRAMS)
+      set(args PROGRAMS ${IN_PROGRAMS})
     elseif(IN_DIRECTORY)
       set(args DIRECTORY ${IN_DIRECTORY})
     elseif(IN_EXPORT)
       set(install_export 1)
     else()
-      message(FATAL_ERROR "Expected FILES or TARGETS")
+      message(FATAL_ERROR "Expected FILES, PROGRAMS, DIRECTORY, or TARGETS")
     endif()
     foreach(package tgz deb el6 el7 pm)
       set(install_path "${install_destination_for_${IN_DESTINATION}_${package}}")
diff --git a/fdbbackup/CMakeLists.txt b/fdbbackup/CMakeLists.txt
index 3d94bbb5bc..433df70d15 100644
--- a/fdbbackup/CMakeLists.txt
+++ b/fdbbackup/CMakeLists.txt
@@ -21,7 +21,7 @@ if(NOT OPEN_FOR_IDE)
     fdb_install(TARGETS fdbbackup DESTINATION bin COMPONENT clients)
   else()
     add_custom_target(prepare_fdbbackup_install ALL DEPENDS strip_only_fdbbackup)
-    fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION bin COMPONENT clients)
+    fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbbackup DESTINATION bin COMPONENT clients)
   endif()
   install_symlink(
     COMPONENT clients
diff --git a/fdbcli/CMakeLists.txt b/fdbcli/CMakeLists.txt
index c268fa9bc8..a54a066e43 100644
--- a/fdbcli/CMakeLists.txt
+++ b/fdbcli/CMakeLists.txt
@@ -15,5 +15,5 @@ if(GENERATE_DEBUG_PACKAGES)
   fdb_install(TARGETS fdbcli DESTINATION bin COMPONENT clients)
 else()
   add_custom_target(prepare_fdbcli_install ALL DEPENDS strip_only_fdbcli)
-  fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbcli DESTINATION bin COMPONENT clients)
+  fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbcli DESTINATION bin COMPONENT clients)
 endif()
diff --git a/fdbmonitor/CMakeLists.txt b/fdbmonitor/CMakeLists.txt
index ae5538ce4c..b135ad23da 100644
--- a/fdbmonitor/CMakeLists.txt
+++ b/fdbmonitor/CMakeLists.txt
@@ -14,7 +14,7 @@ if(GENERATE_DEBUG_PACKAGES)
   fdb_install(TARGETS fdbmonitor DESTINATION fdbmonitor COMPONENT server)
 else()
   add_custom_target(prepare_fdbmonitor_install ALL DEPENDS strip_only_fdbmonitor)
-  fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbmonitor DESTINATION fdbmonitor COMPONENT server)
+  fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbmonitor DESTINATION fdbmonitor COMPONENT server)
 endif()
 
 # Create a local sandbox for quick manual testing without simulator
diff --git a/fdbserver/CMakeLists.txt b/fdbserver/CMakeLists.txt
index 9b687a4580..07ba9cf1d3 100644
--- a/fdbserver/CMakeLists.txt
+++ b/fdbserver/CMakeLists.txt
@@ -240,5 +240,5 @@ if(GENERATE_DEBUG_PACKAGES)
   fdb_install(TARGETS fdbserver DESTINATION sbin COMPONENT server)
 else()
   add_custom_target(prepare_fdbserver_install ALL DEPENDS strip_only_fdbserver)
-  fdb_install(FILES ${CMAKE_BINARY_DIR}/packages/bin/fdbserver sbin COMPONENT server)
+  fdb_install(PROGRAMS ${CMAKE_BINARY_DIR}/packages/bin/fdbserver DESTINATION sbin COMPONENT server)
 endif()