diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php
index 4fb425e8..7fb4ab90 100644
--- a/library/Director/IcingaConfig/IcingaConfig.php
+++ b/library/Director/IcingaConfig/IcingaConfig.php
@@ -426,6 +426,7 @@ class IcingaConfig
             ->createFileFromDb('host')
             ->createFileFromDb('serviceGroup')
             ->createFileFromDb('service')
+            ->createFileFromDb('serviceSet')
             ->createFileFromDb('userGroup')
             ->createFileFromDb('user')
             ->createFileFromDb('notification')
@@ -504,6 +505,7 @@ template Service DirectorOverrideTemplate {
 
         return sprintf(
             '
+/* Warning: this is experimental and might be removed */
 apply Service for (title => params in host.vars["%s"]) {
 
   var override = host.vars["%s_vars"][title]