diff --git a/application/clicommands/ServicesetCommand.php b/application/clicommands/ServicesetCommand.php
new file mode 100644
index 00000000..648a42ce
--- /dev/null
+++ b/application/clicommands/ServicesetCommand.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Icinga\Module\Director\Clicommands;
+
+/**
+ * Manage Icinga Service Sets
+ *
+ * Use this command to show, create, modify or delete Icinga Service
+ * objects
+ */
+class ServicesetCommand extends ServiceCommand
+{
+    protected $type = 'ServiceSet';
+}
diff --git a/library/Director/Objects/IcingaService.php b/library/Director/Objects/IcingaService.php
index 0be85540..31eecb4d 100644
--- a/library/Director/Objects/IcingaService.php
+++ b/library/Director/Objects/IcingaService.php
@@ -78,6 +78,8 @@ class IcingaService extends IcingaObject
 
     protected $supportsApplyRules = true;
 
+    protected $supportsSets = true;
+
     protected $keyName = array('host_id', 'object_name');
 
     protected $prioritizedProperties = array('host_id');
diff --git a/library/Director/Objects/IcingaServiceSet.php b/library/Director/Objects/IcingaServiceSet.php
index 5ec7de1e..98e8b436 100644
--- a/library/Director/Objects/IcingaServiceSet.php
+++ b/library/Director/Objects/IcingaServiceSet.php
@@ -19,6 +19,8 @@ class IcingaServiceSet extends IcingaObject
         'description'           => null,
     );
 
+    protected $keyName = array('host_id', 'object_name');
+
     protected $supportsCustomVars = true;
 
     protected $supportsApplyRules = true;