diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index cc49f0ba7..ec0c7a6a3 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -30,7 +30,7 @@ LoadPlugin syslog
 #LoadPlugin wireless
 LoadPlugin match_regex
 
-include "/etc/collectd.precache"
+include "/etc/collectd.d/collectd.precache"
 
 <Plugin interface>
 	Interface "lo"
@@ -86,6 +86,5 @@ include "/etc/collectd.precache"
 	LogLevel info
 </Plugin>
 
-#include "/etc/collectd.thermal"
-include "/etc/collectd.custom"
-include "/etc/collectd.vpn"
+#include "/etc/collectd.d/collectd.thermal"
+include "/etc/collectd.d/*"
diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.custom
deleted file mode 100644
index 7443bf3e6..000000000
--- a/config/collectd/collectd.custom
+++ /dev/null
@@ -1 +0,0 @@
-# Use this file to add custom configs and rules for collectd
diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 65408dc7f..8a12fa844 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,8 +1,8 @@
 etc/collectd.conf
-etc/collectd.custom
-etc/collectd.precache
-etc/collectd.thermal
-etc/collectd.vpn
+#etc/collectd.d
+etc/collectd.d/collectd.vpn
+etc/collectd.d/collectd.precache
+etc/collectd.d/collectd.thermal
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
diff --git a/lfs/collectd b/lfs/collectd
index 24f5bc632..3f0deca26 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -125,10 +125,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-librrd=/usr/share/rrdtool-1.2.30 \
 		--with-fp-layout=nothing
 	cd $(DIR_APP) && make install #collectd-4 does not support parallel build
-	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
-	mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn
+	mkdir /etc/collectd.d
+	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/collectd.d/
+	mv /etc/collectd.d/collectd.vpn /var/ipfire/ovpn/collectd.vpn
+	mv /etc/collectd.d/collectd.conf /etc/
 	chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
-	ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.vpn
+	ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.d/collectd.vpn
 	ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd
 	ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd
 	ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd
diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd
index 56b799d56..79a81ce6a 100644
--- a/src/initscripts/system/collectd
+++ b/src/initscripts/system/collectd
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2024  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -68,9 +68,6 @@ case "$1" in
 		# ARM does not support to scan for sensors. In that case,
 		# we create an empty configuration file.
 		machine=$(uname -m)
-		if [ "${machine:0:3}" = "arm" ]; then
-			touch /etc/sysconfig/lm_sensors
-		fi
 		if [ "${machine:0:7}" = "aarch64" ]; then
 			touch /etc/sysconfig/lm_sensors
 		fi
@@ -127,9 +124,9 @@ case "$1" in
 
 		# Enable thermal plugin if thermal_zone found
 		if [ ! -e  /sys/class/thermal/thermal_zone0 ]; then
-			sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.thermal"|g' /etc/collectd.conf
+			sed -i -e 's|^include "/etc/collectd.d/collectd.thermal"$|#include "/etc/collectd.d/collectd.thermal"|g' /etc/collectd.conf
 		else
-			sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf
+			sed -i -e 's|^#include "/etc/collectd.d/collectd.thermal"$|include "/etc/collectd.d/collectd.thermal"|g' /etc/collectd.conf
 		fi
 
 		# Enable cpufreq plugin if cpufreq found