diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2990b4ac1..bcb73fffb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,7 @@ add_subdirectory(itl)
 add_subdirectory(doc)
 add_subdirectory(test)
 add_subdirectory(pki)
-add_subdirectory(contrib)
+add_subdirectory(agent)
 add_subdirectory(python)
 
 set(CPACK_PACKAGE_NAME "Icinga2")
diff --git a/contrib/CMakeLists.txt b/agent/CMakeLists.txt
similarity index 72%
rename from contrib/CMakeLists.txt
rename to agent/CMakeLists.txt
index 6cca97fed..b60318da4 100644
--- a/contrib/CMakeLists.txt
+++ b/agent/CMakeLists.txt
@@ -20,6 +20,13 @@ if(UNIX OR CYGWIN)
   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)
+
+  install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent ${CMAKE_CURRENT_BINARY_DIR}/icinga2-setup-agent
+          ${CMAKE_CURRENT_BINARY_DIR}/icinga2-forget-agent ${CMAKE_CURRENT_BINARY_DIR}/icinga2-list-agents
+    DESTINATION ${CMAKE_INSTALL_SBINDIR}
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+  )
 endif()
 
 if(MSVC)
@@ -29,4 +36,8 @@ if(MSVC)
     TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC
   )
 
+  install(
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/bin/\${CMAKE_INSTALL_CONFIG_NAME}/Icinga2SetupAgent.exe
+    DESTINATION ${CMAKE_INSTALL_SBINDIR}
+  )
 endif()
diff --git a/contrib/icinga2-discover-agent.cmake b/agent/icinga2-discover-agent.cmake
similarity index 100%
rename from contrib/icinga2-discover-agent.cmake
rename to agent/icinga2-discover-agent.cmake
diff --git a/contrib/icinga2-forget-agent.cmake b/agent/icinga2-forget-agent.cmake
similarity index 100%
rename from contrib/icinga2-forget-agent.cmake
rename to agent/icinga2-forget-agent.cmake
diff --git a/contrib/icinga2-list-agents.cmake b/agent/icinga2-list-agents.cmake
similarity index 100%
rename from contrib/icinga2-list-agents.cmake
rename to agent/icinga2-list-agents.cmake
diff --git a/contrib/icinga2-setup-agent.cmake b/agent/icinga2-setup-agent.cmake
similarity index 100%
rename from contrib/icinga2-setup-agent.cmake
rename to agent/icinga2-setup-agent.cmake
diff --git a/contrib/icinga2-setup-agent/.gitignore b/agent/icinga2-setup-agent/.gitignore
similarity index 100%
rename from contrib/icinga2-setup-agent/.gitignore
rename to agent/icinga2-setup-agent/.gitignore
diff --git a/contrib/icinga2-setup-agent/AgentWizard.Designer.cs b/agent/icinga2-setup-agent/AgentWizard.Designer.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/AgentWizard.Designer.cs
rename to agent/icinga2-setup-agent/AgentWizard.Designer.cs
diff --git a/contrib/icinga2-setup-agent/AgentWizard.cs b/agent/icinga2-setup-agent/AgentWizard.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/AgentWizard.cs
rename to agent/icinga2-setup-agent/AgentWizard.cs
diff --git a/contrib/icinga2-setup-agent/AgentWizard.resx b/agent/icinga2-setup-agent/AgentWizard.resx
similarity index 100%
rename from contrib/icinga2-setup-agent/AgentWizard.resx
rename to agent/icinga2-setup-agent/AgentWizard.resx
diff --git a/contrib/icinga2-setup-agent/App.config b/agent/icinga2-setup-agent/App.config
similarity index 100%
rename from contrib/icinga2-setup-agent/App.config
rename to agent/icinga2-setup-agent/App.config
diff --git a/contrib/icinga2-setup-agent/Icinga2SetupAgent.csproj b/agent/icinga2-setup-agent/Icinga2SetupAgent.csproj
similarity index 100%
rename from contrib/icinga2-setup-agent/Icinga2SetupAgent.csproj
rename to agent/icinga2-setup-agent/Icinga2SetupAgent.csproj
diff --git a/contrib/icinga2-setup-agent/Program.cs b/agent/icinga2-setup-agent/Program.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/Program.cs
rename to agent/icinga2-setup-agent/Program.cs
diff --git a/contrib/icinga2-setup-agent/Properties/AssemblyInfo.cs b/agent/icinga2-setup-agent/Properties/AssemblyInfo.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/Properties/AssemblyInfo.cs
rename to agent/icinga2-setup-agent/Properties/AssemblyInfo.cs
diff --git a/contrib/icinga2-setup-agent/Properties/Resources.Designer.cs b/agent/icinga2-setup-agent/Properties/Resources.Designer.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/Properties/Resources.Designer.cs
rename to agent/icinga2-setup-agent/Properties/Resources.Designer.cs
diff --git a/contrib/icinga2-setup-agent/Properties/Resources.resx b/agent/icinga2-setup-agent/Properties/Resources.resx
similarity index 100%
rename from contrib/icinga2-setup-agent/Properties/Resources.resx
rename to agent/icinga2-setup-agent/Properties/Resources.resx
diff --git a/contrib/icinga2-setup-agent/Properties/Settings.Designer.cs b/agent/icinga2-setup-agent/Properties/Settings.Designer.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/Properties/Settings.Designer.cs
rename to agent/icinga2-setup-agent/Properties/Settings.Designer.cs
diff --git a/contrib/icinga2-setup-agent/Properties/Settings.settings b/agent/icinga2-setup-agent/Properties/Settings.settings
similarity index 100%
rename from contrib/icinga2-setup-agent/Properties/Settings.settings
rename to agent/icinga2-setup-agent/Properties/Settings.settings
diff --git a/contrib/icinga2-setup-agent/app.manifest b/agent/icinga2-setup-agent/app.manifest
similarity index 100%
rename from contrib/icinga2-setup-agent/app.manifest
rename to agent/icinga2-setup-agent/app.manifest
diff --git a/contrib/icinga2-setup-agent/icinga-banner.png b/agent/icinga2-setup-agent/icinga-banner.png
similarity index 100%
rename from contrib/icinga2-setup-agent/icinga-banner.png
rename to agent/icinga2-setup-agent/icinga-banner.png
diff --git a/contrib/icinga2-setup-agent/icinga.ico b/agent/icinga2-setup-agent/icinga.ico
similarity index 100%
rename from contrib/icinga2-setup-agent/icinga.ico
rename to agent/icinga2-setup-agent/icinga.ico
diff --git a/contrib/icinga2-setup-agent/tar-cs/COPYING b/agent/icinga2-setup-agent/tar-cs/COPYING
similarity index 100%
rename from contrib/icinga2-setup-agent/tar-cs/COPYING
rename to agent/icinga2-setup-agent/tar-cs/COPYING
diff --git a/contrib/icinga2-setup-agent/tar-cs/ITarHeader.cs b/agent/icinga2-setup-agent/tar-cs/ITarHeader.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/tar-cs/ITarHeader.cs
rename to agent/icinga2-setup-agent/tar-cs/ITarHeader.cs
diff --git a/contrib/icinga2-setup-agent/tar-cs/TarException.cs b/agent/icinga2-setup-agent/tar-cs/TarException.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/tar-cs/TarException.cs
rename to agent/icinga2-setup-agent/tar-cs/TarException.cs
diff --git a/contrib/icinga2-setup-agent/tar-cs/TarHeader.cs b/agent/icinga2-setup-agent/tar-cs/TarHeader.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/tar-cs/TarHeader.cs
rename to agent/icinga2-setup-agent/tar-cs/TarHeader.cs
diff --git a/contrib/icinga2-setup-agent/tar-cs/TarReader.cs b/agent/icinga2-setup-agent/tar-cs/TarReader.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/tar-cs/TarReader.cs
rename to agent/icinga2-setup-agent/tar-cs/TarReader.cs
diff --git a/contrib/icinga2-setup-agent/tar-cs/UsTarHeader.cs b/agent/icinga2-setup-agent/tar-cs/UsTarHeader.cs
similarity index 100%
rename from contrib/icinga2-setup-agent/tar-cs/UsTarHeader.cs
rename to agent/icinga2-setup-agent/tar-cs/UsTarHeader.cs
diff --git a/icinga2.spec b/icinga2.spec
index 99c895d1b..adb6578d8 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -474,6 +474,10 @@ exit 0
 %{_sbindir}/%{name}-list-objects
 %{_sbindir}/%{name}-enable-feature
 %{_sbindir}/%{name}-disable-feature
+%{_sbindir}/%{name}-setup-agent
+%{_sbindir}/%{name}-discover-agent
+%{_sbindir}/%{name}-forget-agent
+%{_sbindir}/%{name}-list-agents
 %{_sbindir}/%{name}-prepare-dirs
 %exclude %{_libdir}/%{name}/libdb_ido_mysql*
 %exclude %{_libdir}/%{name}/libdb_ido_pgsql*