diff --git a/etc/icinga2/features-available/Makefile.am b/etc/icinga2/features-available/Makefile.am
index ef67dc7b4..c99341e3e 100644
--- a/etc/icinga2/features-available/Makefile.am
+++ b/etc/icinga2/features-available/Makefile.am
@@ -3,10 +3,12 @@
 icinga2confdir = $(sysconfdir)/icinga2/features-available
 
 CONFIG_FILES = \
+	checker.conf \
 	command.conf \
 	compat-log.conf \
 	ido-mysql.conf \
 	livestatus.conf \
+	notification.conf \
 	perfdata.conf \
 	statusdat.conf
 
diff --git a/etc/icinga2/features-available/checker.conf b/etc/icinga2/features-available/checker.conf
new file mode 100644
index 000000000..13755b50a
--- /dev/null
+++ b/etc/icinga2/features-available/checker.conf
@@ -0,0 +1,7 @@
+/**
+ * The checker component takes care of executing service checks.
+ *
+
+library "checker"
+
+object CheckerComponent "checker" { }
diff --git a/etc/icinga2/features-available/notification.conf b/etc/icinga2/features-available/notification.conf
new file mode 100644
index 000000000..91d80313d
--- /dev/null
+++ b/etc/icinga2/features-available/notification.conf
@@ -0,0 +1,7 @@
+/**
+ * The notification component takes care of executing service checks.
+ *
+
+library "notification"
+
+object NotificationComponent "notification" { }