diff --git a/include/transport/transport.h b/include/transport/transport.h
index 3d81307f..e6f0610d 100644
--- a/include/transport/transport.h
+++ b/include/transport/transport.h
@@ -48,7 +48,6 @@ namespace Transport {
 	// 
 	class StorageBackend;
 	class DiscoInfoResponder;
-	class DiscoItemsResponder;
 	class Factory;
 	class UserRegistry;
 
@@ -188,7 +187,6 @@ namespace Transport {
 			Transport::UserRegistry *m_userRegistry;
 			StorageBackend *m_storageBackend;
  			DiscoInfoResponder *m_discoInfoResponder;
-			DiscoItemsResponder *m_discoItemsResponder;
 			int m_reconnectCount;
 			Config* m_config;
 			std::string m_protocol;
diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index ab5bc790..e8867d45 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -14,6 +14,7 @@
 #include "transport/util.h"
 #include "transport/gatewayresponder.h"
 #include "transport/logging.h"
+#include "transport/discoitemsresponder.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
@@ -313,6 +314,9 @@ int main(int argc, char **argv)
 	GatewayResponder gatewayResponder(transport.getIQRouter(), &userManager);
 	gatewayResponder.start();
 
+	DiscoItemsResponder discoItemsResponder(&transport);
+	discoItemsResponder.start();
+
 	eventLoop_ = &eventLoop;
 
 	eventLoop.run();
diff --git a/src/transport.cpp b/src/transport.cpp
index 24f05ddf..391c8ffa 100644
--- a/src/transport.cpp
+++ b/src/transport.cpp
@@ -26,7 +26,6 @@
 #include "transport/userregistry.h"
 #include "transport/logging.h"
 #include "discoinforesponder.h"
-#include "transport/discoitemsresponder.h"
 #include "storageparser.h"
 #include "Swiften/TLS/OpenSSL/OpenSSLServerContext.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
@@ -149,9 +148,6 @@ Component::Component(Swift::EventLoop *loop, Swift::NetworkFactories *factories,
 	m_discoInfoResponder = new DiscoInfoResponder(m_iqRouter, m_config);
 	m_discoInfoResponder->start();
 
-	m_discoItemsResponder = new DiscoItemsResponder(this);
-	m_discoItemsResponder->start();
-
 // 
 // 	m_registerHandler = new SpectrumRegisterHandler(m_component);
 // 	m_registerHandler->start();
@@ -163,7 +159,6 @@ Component::~Component() {
 	delete m_capsManager;
 	delete m_capsMemoryStorage;
 	delete m_discoInfoResponder;
-	delete m_discoItemsResponder;
 	if (m_component)
 		delete m_component;
 	if (m_server) {