diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89e1c3a27..f2a338023 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,6 +142,7 @@ add_subdirectory(itl)
 add_subdirectory(doc)
 add_subdirectory(test)
 add_subdirectory(pki)
+add_subdirectory(contrib)
 
 set(CPACK_PACKAGE_NAME "Icinga2")
 set(CPACK_PACKAGE_VENDOR "Icinga Development Team")
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
new file mode 100644
index 000000000..77249306d
--- /dev/null
+++ b/contrib/CMakeLists.txt
@@ -0,0 +1,32 @@
+# Icinga 2
+# Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+if(UNIX OR CYGWIN)
+  configure_file(icinga2-enable-feature.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-enable-feature @ONLY)
+  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)
+endif()
+
+if(MSVC)
+  include_external_msproject(
+    icinga2setupagent
+    ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/Icinga2SetupAgent.csproj
+    TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC
+  )
+
+endif()
diff --git a/tools/icinga2-discover-agent.cmake b/contrib/icinga2-discover-agent.cmake
similarity index 100%
rename from tools/icinga2-discover-agent.cmake
rename to contrib/icinga2-discover-agent.cmake
diff --git a/tools/icinga2-enable-feature.cmake b/contrib/icinga2-enable-feature.cmake
similarity index 100%
rename from tools/icinga2-enable-feature.cmake
rename to contrib/icinga2-enable-feature.cmake
diff --git a/tools/icinga2-forget-agent.cmake b/contrib/icinga2-forget-agent.cmake
similarity index 100%
rename from tools/icinga2-forget-agent.cmake
rename to contrib/icinga2-forget-agent.cmake
diff --git a/tools/icinga2-list-agents.cmake b/contrib/icinga2-list-agents.cmake
similarity index 100%
rename from tools/icinga2-list-agents.cmake
rename to contrib/icinga2-list-agents.cmake
diff --git a/tools/icinga2-setup-agent/.gitignore b/contrib/icinga2-setup-agent/.gitignore
similarity index 100%
rename from tools/icinga2-setup-agent/.gitignore
rename to contrib/icinga2-setup-agent/.gitignore
diff --git a/tools/icinga2-setup-agent/AgentWizard.Designer.cs b/contrib/icinga2-setup-agent/AgentWizard.Designer.cs
similarity index 100%
rename from tools/icinga2-setup-agent/AgentWizard.Designer.cs
rename to contrib/icinga2-setup-agent/AgentWizard.Designer.cs
diff --git a/tools/icinga2-setup-agent/AgentWizard.cs b/contrib/icinga2-setup-agent/AgentWizard.cs
similarity index 100%
rename from tools/icinga2-setup-agent/AgentWizard.cs
rename to contrib/icinga2-setup-agent/AgentWizard.cs
diff --git a/tools/icinga2-setup-agent/AgentWizard.resx b/contrib/icinga2-setup-agent/AgentWizard.resx
similarity index 100%
rename from tools/icinga2-setup-agent/AgentWizard.resx
rename to contrib/icinga2-setup-agent/AgentWizard.resx
diff --git a/tools/icinga2-setup-agent/App.config b/contrib/icinga2-setup-agent/App.config
similarity index 100%
rename from tools/icinga2-setup-agent/App.config
rename to contrib/icinga2-setup-agent/App.config
diff --git a/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj b/contrib/icinga2-setup-agent/Icinga2SetupAgent.csproj
similarity index 100%
rename from tools/icinga2-setup-agent/Icinga2SetupAgent.csproj
rename to contrib/icinga2-setup-agent/Icinga2SetupAgent.csproj
diff --git a/tools/icinga2-setup-agent/Program.cs b/contrib/icinga2-setup-agent/Program.cs
similarity index 100%
rename from tools/icinga2-setup-agent/Program.cs
rename to contrib/icinga2-setup-agent/Program.cs
diff --git a/tools/icinga2-setup-agent/Properties/AssemblyInfo.cs b/contrib/icinga2-setup-agent/Properties/AssemblyInfo.cs
similarity index 100%
rename from tools/icinga2-setup-agent/Properties/AssemblyInfo.cs
rename to contrib/icinga2-setup-agent/Properties/AssemblyInfo.cs
diff --git a/tools/icinga2-setup-agent/Properties/Resources.Designer.cs b/contrib/icinga2-setup-agent/Properties/Resources.Designer.cs
similarity index 100%
rename from tools/icinga2-setup-agent/Properties/Resources.Designer.cs
rename to contrib/icinga2-setup-agent/Properties/Resources.Designer.cs
diff --git a/tools/icinga2-setup-agent/Properties/Resources.resx b/contrib/icinga2-setup-agent/Properties/Resources.resx
similarity index 100%
rename from tools/icinga2-setup-agent/Properties/Resources.resx
rename to contrib/icinga2-setup-agent/Properties/Resources.resx
diff --git a/tools/icinga2-setup-agent/Properties/Settings.Designer.cs b/contrib/icinga2-setup-agent/Properties/Settings.Designer.cs
similarity index 100%
rename from tools/icinga2-setup-agent/Properties/Settings.Designer.cs
rename to contrib/icinga2-setup-agent/Properties/Settings.Designer.cs
diff --git a/tools/icinga2-setup-agent/Properties/Settings.settings b/contrib/icinga2-setup-agent/Properties/Settings.settings
similarity index 100%
rename from tools/icinga2-setup-agent/Properties/Settings.settings
rename to contrib/icinga2-setup-agent/Properties/Settings.settings
diff --git a/tools/icinga2-setup-agent/app.manifest b/contrib/icinga2-setup-agent/app.manifest
similarity index 100%
rename from tools/icinga2-setup-agent/app.manifest
rename to contrib/icinga2-setup-agent/app.manifest
diff --git a/tools/icinga2-setup-agent/icinga-banner.png b/contrib/icinga2-setup-agent/icinga-banner.png
similarity index 100%
rename from tools/icinga2-setup-agent/icinga-banner.png
rename to contrib/icinga2-setup-agent/icinga-banner.png
diff --git a/tools/icinga2-setup-agent/icinga.ico b/contrib/icinga2-setup-agent/icinga.ico
similarity index 100%
rename from tools/icinga2-setup-agent/icinga.ico
rename to contrib/icinga2-setup-agent/icinga.ico
diff --git a/tools/icinga2-setup-agent/tar-cs/COPYING b/contrib/icinga2-setup-agent/tar-cs/COPYING
similarity index 100%
rename from tools/icinga2-setup-agent/tar-cs/COPYING
rename to contrib/icinga2-setup-agent/tar-cs/COPYING
diff --git a/tools/icinga2-setup-agent/tar-cs/ITarHeader.cs b/contrib/icinga2-setup-agent/tar-cs/ITarHeader.cs
similarity index 100%
rename from tools/icinga2-setup-agent/tar-cs/ITarHeader.cs
rename to contrib/icinga2-setup-agent/tar-cs/ITarHeader.cs
diff --git a/tools/icinga2-setup-agent/tar-cs/TarException.cs b/contrib/icinga2-setup-agent/tar-cs/TarException.cs
similarity index 100%
rename from tools/icinga2-setup-agent/tar-cs/TarException.cs
rename to contrib/icinga2-setup-agent/tar-cs/TarException.cs
diff --git a/tools/icinga2-setup-agent/tar-cs/TarHeader.cs b/contrib/icinga2-setup-agent/tar-cs/TarHeader.cs
similarity index 100%
rename from tools/icinga2-setup-agent/tar-cs/TarHeader.cs
rename to contrib/icinga2-setup-agent/tar-cs/TarHeader.cs
diff --git a/tools/icinga2-setup-agent/tar-cs/TarReader.cs b/contrib/icinga2-setup-agent/tar-cs/TarReader.cs
similarity index 100%
rename from tools/icinga2-setup-agent/tar-cs/TarReader.cs
rename to contrib/icinga2-setup-agent/tar-cs/TarReader.cs
diff --git a/tools/icinga2-setup-agent/tar-cs/UsTarHeader.cs b/contrib/icinga2-setup-agent/tar-cs/UsTarHeader.cs
similarity index 100%
rename from tools/icinga2-setup-agent/tar-cs/UsTarHeader.cs
rename to contrib/icinga2-setup-agent/tar-cs/UsTarHeader.cs
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 2eb48188e..370894aa8 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -19,19 +19,5 @@ add_subdirectory(mkclass)
 add_subdirectory(mkembedconfig)
 
 if(UNIX OR CYGWIN)
-  configure_file(icinga2-enable-feature.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-enable-feature @ONLY)
-  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)
-
   install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ./icinga2-enable-feature \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SBINDIR}/icinga2-disable-feature\")")
 endif()
-
-if(MSVC)
-  include_external_msproject(
-    icinga2setupagent
-    ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/Icinga2SetupAgent.csproj
-    TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC
-  )
-
-endif()