diff --git a/README.rst b/README.rst
index 4b74e3c..2c48994 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
 Collectd
 ========
 
-Collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files. 
+Collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files.
 
 Sample pillars
 ==============
diff --git a/collectd/meta/sphinx.yml b/collectd/meta/sphinx.yml
index e69de29..9399bb8 100644
--- a/collectd/meta/sphinx.yml
+++ b/collectd/meta/sphinx.yml
@@ -0,0 +1,12 @@
+{%- from "collectd/map.jinja" import client with context %}
+doc:
+  name: collectd
+  description: Collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store the values in a variety of ways, for example in RRD files.
+  role:
+    client:
+      name: client
+      param: {}
+{%- for backend_name, backend in client.backend.iteritems() %}
+        backend_{{ backend_name }}: 
+          value: {{ backend.host }}:{{ backend.port }}
+{%- endfor %}
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 03bbde1..41f6c88 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -2,10 +2,10 @@
   collectd:
     _support:
       collectd:
-        enabled: false
+        enabled: true
       heka:
         enabled: false
       sensu:
         enabled: true
       sphinx:
-        enabled: false
+        enabled: true