diff --git a/system/collectd/remote_client/cluster.yml b/system/collectd/remote_client/cluster.yml
new file mode 100644
index 0000000..1edced0
--- /dev/null
+++ b/system/collectd/remote_client/cluster.yml
@@ -0,0 +1,18 @@
+classes:
+- system.collectd.remote_client.output.heka
+- service.collectd.remote_client.cluster
+parameters:
+  collectd:
+    remote_client:
+      automatic_starting: false
+  keepalived:
+    cluster:
+      instance:
+        stacklight_monitor_vip:
+          notify_action:
+            master:
+              - service remote_collectd start
+            backup:
+              - service remote_collectd stop
+            fault:
+              - service remote_collectd stop
diff --git a/system/collectd/remote_client/output/heka.yml b/system/collectd/remote_client/output/heka.yml
new file mode 100644
index 0000000..ec3b5e0
--- /dev/null
+++ b/system/collectd/remote_client/output/heka.yml
@@ -0,0 +1,14 @@
+parameters:
+  _param:
+    collectd_remote_collector_port: 8326
+  collectd:
+    remote_client:
+      enabled: true
+      backend:
+        remote_collector:
+          engine: http
+          host: ${_param:collectd_remote_collector_host}
+          port: ${_param:collectd_remote_collector_port}
+          timeout: 5
+      read_interval: 10
+      use_fqdn: false
diff --git a/system/collectd/remote_client/single.yml b/system/collectd/remote_client/single.yml
new file mode 100644
index 0000000..f49e40d
--- /dev/null
+++ b/system/collectd/remote_client/single.yml
@@ -0,0 +1,7 @@
+classes:
+- system.collectd.remote_client.output.heka
+- service.collectd.remote_client.single
+parameters:
+  collectd:
+    remote_client:
+      automatic_starting: true