diff --git a/icinga/Makefile.am b/icinga/Makefile.am
index e500de8dc..b09174c9d 100644
--- a/icinga/Makefile.am
+++ b/icinga/Makefile.am
@@ -7,6 +7,8 @@ pkglib_LTLIBRARIES =  \
 libicinga_la_SOURCES =  \
 	authenticationcomponent.cpp \
 	authenticationcomponent.h \
+	discoverycomponent.cpp \
+	discoverycomponent.h \
 	endpoint.cpp \
 	endpoint.h \
 	endpointmanager.cpp \
diff --git a/icinga/icingaapplication.cpp b/icinga/icingaapplication.cpp
index 228da63cb..9a736c1ba 100644
--- a/icinga/icingaapplication.cpp
+++ b/icinga/icingaapplication.cpp
@@ -60,6 +60,9 @@ int IcingaApplication::Main(const vector<string>& args)
 	SubscriptionComponent::Ptr subscriptionComponent = make_shared<SubscriptionComponent>();
 	RegisterComponent(subscriptionComponent);
 
+	DiscoveryComponent::Ptr discoveryComponent = make_shared<DiscoveryComponent>();
+	RegisterComponent(discoveryComponent);
+
 	ConfigObject::Ptr fileComponentConfig = make_shared<ConfigObject>("component", "configfile");
 	fileComponentConfig->SetPropertyString("configFilename", args[1]);
 	fileComponentConfig->SetPropertyInteger("replicate", 0);