diff --git a/collectd/client.sls b/collectd/client.sls
index d4d4566..83ed62b 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -16,6 +16,13 @@
   - names: 
     - librabbitmq0
 
+{%- elif grains.os == 'Ubuntu' and (grains.osrelease in ['14.04', '16.04']) %}
+
+collectd_amqp_packages:
+  pkg.installed:
+  - names: 
+    - librabbitmq1
+
 {%- endif %}
 
 collectd_client_packages:
diff --git a/collectd/files/backend/amqp.conf b/collectd/files/backend/amqp.conf
index 242e4be..a6d6806 100644
--- a/collectd/files/backend/amqp.conf
+++ b/collectd/files/backend/amqp.conf
@@ -11,8 +11,6 @@
 		User "{{ backend.user }}"
 		Password "{{ backend.password }}"
 		Exchange "metrics"
-#		ExchangeType "amq.topic"
-#		RoutingKey "metrics"
 		Persistent true
 		Format "Graphite"
 		GraphitePrefix "{{ system.get('cluster', 'prd') }}_{{ system.get('environment', 'prd') }}."