diff --git a/roles/collectd/defaults/main.yml b/roles/collectd/defaults/main.yml
index 885f993..d0f9cf3 100644
--- a/roles/collectd/defaults/main.yml
+++ b/roles/collectd/defaults/main.yml
@@ -5,3 +5,5 @@ collectd_network_servers:
 collectd_network_listen: []
 
 collectd_disable_plugins: []
+
+collectd_df: {}
diff --git a/roles/collectd/templates/collectd.conf.j2 b/roles/collectd/templates/collectd.conf.j2
index d485c38..967f555 100644
--- a/roles/collectd/templates/collectd.conf.j2
+++ b/roles/collectd/templates/collectd.conf.j2
@@ -587,6 +587,19 @@ LoadPlugin {{ name }}
 #    EnableDispatchAll false
 #</Plugin>
 
+{% if collectd_df %}
+<Plugin df>
+{% for key, value in collectd_df.items() %}
+{% if value is boolean %}
+    {{ key }} {{ value|string|lower }}
+{% elif value is number %}
+    {{ key }} {{ value }}
+{% else %}
+    {{ key }} "{{ value }}"
+{% endif %}
+{% endfor %}
+</Plugin>
+{% else %}
 #<Plugin df>
 #	Device "/dev/hda1"
 #	Device "192.168.0.2:/mnt/nfs"
@@ -599,6 +612,7 @@ LoadPlugin {{ name }}
 #	ValuesAbsolute true
 #	ValuesPercentage false
 #</Plugin>
+{% endif %}
 
 #<Plugin disk>
 #	Disk "/^[hs]d[a-f][0-9]?$/"