diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 74d305b46..03f300148 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd
PKG_VERSION:=5.5.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/
diff --git a/utils/collectd/files/collectd.conf b/utils/collectd/files/collectd.conf
index 2ef78fe7f..3afbfad47 100644
--- a/utils/collectd/files/collectd.conf
+++ b/utils/collectd/files/collectd.conf
@@ -1,90 +1,39 @@
-#
-# OpenWrt Config file for collectd(1).
-# Please read collectd.conf(5) for a list of options.
-# http://collectd.org/
-#
+# Config file for collectd. More info: https://collectd.org/
+# Note: Luci statistics will generate a new config and overwrite this file.
#Hostname "localhost"
#FQDNLookup true
-BaseDir "/var/lib/collectd"
-PIDFile "/var/run/collectd.pid"
-#PluginDir "/usr/lib/collectd"
-#TypesDB "/usr/share/collectd/types.db"
+BaseDir "/var/run/collectd"
+Include "/etc/collectd/conf.d"
+PIDFile "/var/run/collectd.pid"
+PluginDir "/usr/lib/collectd"
+TypesDB "/usr/share/collectd/types.db"
Interval 30
ReadThreads 2
-#LoadPlugin syslog
-#LoadPlugin logfile
-
-#
-# LogLevel info
-#
-
-#
-# LogLevel info
-# File STDOUT
-# Timestamp true
-#
-
-LoadPlugin cpu
-LoadPlugin df
-LoadPlugin disk
LoadPlugin interface
LoadPlugin load
-LoadPlugin memory
-LoadPlugin network
#LoadPlugin ping
-#LoadPlugin processes
-#LoadPlugin rrdtool
-#LoadPlugin serial
-LoadPlugin wireless
-
-#
-# FSType tmpfs
-# IgnoreSelected true
-# ReportByDevice false
-# ReportReserved false
-# ReportInodes false
-#
-
-#
-# Disk "/^[hs]d[a-f][0-9]?$/"
-# IgnoreSelected false
-#
-
-#
-# Interface "eth0"
-# Interface "br-lan"
-# IgnoreSelected false
-#
+LoadPlugin rrdtool
+
+
+ DataDir "/tmp/rrd"
+ RRARows 100
+ RRASingle true
+ RRATimespan 3600
+ RRATimespan 86400
+ RRATimespan 604800
+ RRATimespan 2678400
+ RRATimespan 31622400
+
-
-# Server "ff18::efc0:4a42" "25826"
- Server "239.192.74.66" "25826"
-# Listen "ff18::efc0:4a42" "25826"
-# Listen "239.192.74.66" "25826"
-# TimeToLive "128"
-# Forward false
-# CacheFlush 1800
-# ReportStats false
+
+ IgnoreSelected false
+ Interface "br-lan"
#
# Host "host.foo.bar"
-# Interval 1.0
-# Timeout 0.9
-# TTL 255
-# SourceAddress "1.2.3.4"
-# Device "eth0"
-# MaxMissed -1
-#
-
-#
-# Process "name"
-#
-
-#
-# DataDir "/var/lib/collectd/rrd"
-# CacheTimeout 120
-# CacheFlush 900
+# Interval 30
+# TTL 127
#