diff --git a/configure.ac b/configure.ac
index 414ebf703..50eddcb07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,6 @@ components/demo/Makefile
 components/replication/Makefile
 docs/Doxyfile
 icinga-app/Makefile
-icinga-app/config/Makefile
 lib/Makefile
 lib/base/Makefile
 lib/config/Makefile
diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am
index e5fc0887d..1969812c0 100644
--- a/icinga-app/Makefile.am
+++ b/icinga-app/Makefile.am
@@ -1,8 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = \
-	config
-
 bin_PROGRAMS = \
 	icinga
 
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index 9d7f91096..f875657fa 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -34,13 +34,13 @@ const String IcingaApplication::DefaultStatePath = "icinga.state";
 IcingaApplication::IcingaApplication(const Dictionary::Ptr& serializedUpdate)
 	: Application(serializedUpdate)
 {
-	/* load cibsync config component */
-	ConfigItemBuilder::Ptr cibsyncComponentConfig = boost::make_shared<ConfigItemBuilder>();
-	cibsyncComponentConfig->SetType("Component");
-	cibsyncComponentConfig->SetName("cibsync");
-	cibsyncComponentConfig->SetLocal(true);
-	cibsyncComponentConfig->Compile()->Commit();
-	cibsyncComponentConfig.reset();
+	/* load replication config component */
+	ConfigItemBuilder::Ptr replicationComponentConfig = boost::make_shared<ConfigItemBuilder>();
+	replicationComponentConfig->SetType("Component");
+	replicationComponentConfig->SetName("replication");
+	replicationComponentConfig->SetLocal(true);
+	replicationComponentConfig->Compile()->Commit();
+	replicationComponentConfig.reset();
 
 	/* load convenience config component */
 	ConfigItemBuilder::Ptr convenienceComponentConfig = boost::make_shared<ConfigItemBuilder>();