diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index fcd9c9a49..6cca97fed 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -19,6 +19,7 @@ if(UNIX OR CYGWIN)
   configure_file(icinga2-discover-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent @ONLY)
   configure_file(icinga2-forget-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-forget-agent @ONLY)
   configure_file(icinga2-list-agents.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-list-agents @ONLY)
+  configure_file(icinga2-setup-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-setup-agent @ONLY)
 endif()
 
 if(MSVC)
diff --git a/pki/icinga2-setup-agent.cmake b/contrib/icinga2-setup-agent.cmake
similarity index 100%
rename from pki/icinga2-setup-agent.cmake
rename to contrib/icinga2-setup-agent.cmake
diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt
index 211175f3b..76494e3b6 100644
--- a/pki/CMakeLists.txt
+++ b/pki/CMakeLists.txt
@@ -19,7 +19,6 @@ if(UNIX OR CYGWIN)
   configure_file(icinga2-build-ca.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-build-ca @ONLY)
   configure_file(icinga2-build-key.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-build-key @ONLY)
   configure_file(icinga2-sign-key.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-sign-key @ONLY)
-  configure_file(icinga2-setup-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-setup-agent @ONLY)
 
   install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/icinga2-build-ca ${CMAKE_CURRENT_BINARY_DIR}/icinga2-build-key
@@ -28,12 +27,6 @@ if(UNIX OR CYGWIN)
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
   )
 
-  install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/icinga2-setup-agent
-    DESTINATION ${CMAKE_INSTALL_SBINDIR}
-    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-  )
-
   install(
     FILES openssl.cnf openssl-quiet.cnf pkifuncs vars
     DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/pki