diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index e8867d45653b0debc81e5bf94f0da19d9a2bd227..45d8b594ec50841a260980a439651c9d06d7280e 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -15,6 +15,8 @@
 #include "transport/gatewayresponder.h"
 #include "transport/logging.h"
 #include "transport/discoitemsresponder.h"
+#include "transport/adhocmanager.h"
+#include "transport/settingsadhoccommand.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
@@ -317,6 +319,12 @@ int main(int argc, char **argv)
 	DiscoItemsResponder discoItemsResponder(&transport);
 	discoItemsResponder.start();
 
+	AdHocManager adhocmanager(&transport, &discoItemsResponder);
+	adhocmanager.start();
+
+	SettingsAdHocCommandFactory settings;
+	adhocmanager.addAdHocCommand(&settings);
+
 	eventLoop_ = &eventLoop;
 
 	eventLoop.run();