diff --git a/README.rst b/README.rst
index f8f4e4a..bacf328 100644
--- a/README.rst
+++ b/README.rst
@@ -10,6 +10,8 @@
 
 Standalone Statsd server with Graphite/carbon backend
 
+.. code-block:: yaml
+
     statsd:
       server:
         enabled: true
@@ -23,6 +25,8 @@
 
 Standalone Statsd server with Graphite/AMQP backend
 
+.. code-block:: yaml
+
     statsd:
       server:
         enabled: true
@@ -32,10 +36,13 @@
         backend:
           engine: amqp
           host: metrics1.domain.com
-          port: 2003
+          port: 5672
+          
 
 Standalone Statsd server with OpenTSDB backend
 
+.. code-block:: yaml
+
     statsd:
       server:
         enabled: true
diff --git a/metadata/service/server/amqp.yml b/metadata/service/server/amqp.yml
deleted file mode 100644
index 6cfce6b..0000000
--- a/metadata/service/server/amqp.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-applications:
-- statsd
-parameters:
-  supervisor:
-    server:
-      service:
-        statsd_server:
-          name: server
-          type: statsd
-  statsd:
-    server:
-      enabled: true
-      bind:
-        port: 8125
-        address: 127.0.0.1
\ No newline at end of file
diff --git a/metadata/service/server/carbon.yml b/metadata/service/server/carbon.yml
index e7e00c7..4a3e391 100644
--- a/metadata/service/server/carbon.yml
+++ b/metadata/service/server/carbon.yml
@@ -4,17 +4,11 @@
   _params:
     statsd_server_backend_host: localhost
     statsd_server_backend_port: 2003
-  supervisor:
-    server:
-      service:
-        statsd_server:
-          name: server
-          type: statsd
   statsd:
     server:
       enabled: true
       bind:
-        address: 127.0.0.1
+        address: 0.0.0.0
         port: 8125
       backend:
         engine: carbon
diff --git a/metadata/service/server/rabbitmq.yml b/metadata/service/server/rabbitmq.yml
new file mode 100644
index 0000000..8c0fdc6
--- /dev/null
+++ b/metadata/service/server/rabbitmq.yml
@@ -0,0 +1,25 @@
+applications:
+- statsd
+parameters:
+  _params:
+    statsd_server_backend_host: localhost
+    statsd_server_backend_port: 5672
+    statsd_server_backend_user: metric
+    statsd_server_backend_virtual_host: 5672
+    statsd_server_backend_queue: metric
+    statsd_server_backend_exchange: metric
+  statsd:
+    server:
+      enabled: true
+      bind:
+        port: 8125
+        address: 127.0.0.1
+      backend:
+        engine: rabbitmq
+        host: ${_param:statsd_server_backend_host}
+        port: ${_param:statsd_server_backend_port}
+        user: ${_param:statsd_server_backend_user}
+        password: ${_param:statsd_server_backend_password}
+        virtual_host: ${_param:statsd_server_backend_virtual_host}
+        queue: ${_param:statsd_server_backend_queue}
+        exchange: ${_param:statsd_server_backend_exchange}
diff --git a/metadata/service/supervisor.yml b/metadata/service/supervisor.yml
new file mode 100644
index 0000000..5c1e2fd
--- /dev/null
+++ b/metadata/service/supervisor.yml
@@ -0,0 +1,7 @@
+parameters:
+  supervisor:
+    server:
+      service:
+        statsd_server:
+          name: server
+          type: statsd
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
new file mode 100644
index 0000000..1947fc0
--- /dev/null
+++ b/metadata/service/support.yml
@@ -0,0 +1,11 @@
+parameters:
+  statsd:
+    _support:
+      collectd:
+        enabled: false
+      heka:
+        enabled: false
+      sensu:
+        enabled: false
+      sphinx:
+        enabled: true
diff --git a/statsd/files/localConfig.js b/statsd/files/localConfig.js
index 1a58b80..b803393 100644
--- a/statsd/files/localConfig.js
+++ b/statsd/files/localConfig.js
@@ -6,7 +6,7 @@
 	graphitePort: {{ server.backend.port }},
 	backends: [ "./backends/graphite" ],
 	{%- endif %}
-	{%- if server.backend.engine == 'amqp' %}
+	{%- if server.backend.engine == 'rabbitmq' %}
 	amqpHost: '{{ server.backend.host }}',
 	amqpPort: {{ server.backend.port }},
 	amqpLogin: '{{ server.backend.user }}',
diff --git a/statsd/server.sls b/statsd/server.sls
index e6ff6de..9ccbaf3 100644
--- a/statsd/server.sls
+++ b/statsd/server.sls
@@ -30,7 +30,7 @@
     - file: {{ server.config }}
     - pkg: statsd_pkgs
 
-{%- if server.backend.engine == 'amqp' %}
+{%- if server.backend.engine == 'rabbitmq' %}
 
 statsd_backend_pkgs:
   pkg.installed: