diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/core/190/filelists/files
index 2f90a2d5c..9c0994bc6 100644
--- a/config/rootfiles/core/190/filelists/files
+++ b/config/rootfiles/core/190/filelists/files
@@ -1,3 +1,6 @@
+etc/collectd.conf
+etc/collectd.d
+etc/rc.d/init.d/collectd
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 var/ipfire/network-functions.pl
diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/core/190/update.sh
index 5abd6d6b7..95ab84a8a 100644
--- a/config/rootfiles/core/190/update.sh
+++ b/config/rootfiles/core/190/update.sh
@@ -50,7 +50,13 @@ ldconfig
 # Apply local configuration to sshd_config
 /usr/local/bin/sshctrl
 
+# collectd
+if [ -e "/etc/collectd.custom" ]; then
+	mv -v /etc/collectd.custom /etc/collectd.d/
+fi
+
 # Start services
+/etc/init.d/collectd restart
 
 # This update needs a reboot...
 touch /var/run/need_reboot