diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 2ac99f6a6..3785346ba 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -25,7 +25,6 @@ LoadPlugin processes
 LoadPlugin rrdtool
 LoadPlugin sensors
 LoadPlugin swap
-LoadPlugin thermal
 LoadPlugin syslog
 #LoadPlugin wireless
 
@@ -82,14 +81,4 @@ LoadPlugin syslog
 	LogLevel info
 </Plugin>
 
-<Plugin thermal>
-	Device "cooling_device0"
-	Device "cooling_device1"
-	Device "cooling_device2"
-	Device "cooling_device3"
-	Device "cooling_device4"
-	Device "cooling_device5"
-	Device "cooling_device6"
-	Device "cooling_device7"
-	IgnoreSelected true
-</Plugin>
+#include "/etc/collectd.thermal"
diff --git a/config/collectd/collectd.thermal b/config/collectd/collectd.thermal
new file mode 100644
index 000000000..97403fbb6
--- /dev/null
+++ b/config/collectd/collectd.thermal
@@ -0,0 +1,13 @@
+LoadPlugin thermal
+
+<Plugin thermal>
+	Device "cooling_device0"
+	Device "cooling_device1"
+	Device "cooling_device2"
+	Device "cooling_device3"
+	Device "cooling_device4"
+	Device "cooling_device5"
+	Device "cooling_device6"
+	Device "cooling_device7"
+	IgnoreSelected true
+</Plugin>
diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index 6a7d9e33e..29160941d 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -1,4 +1,5 @@
 etc/collectd.conf
+etc/collectd.thermal
 etc/rc.d/init.d/collectd
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S21collectd
diff --git a/config/rootfiles/core/28/filelists/files b/config/rootfiles/core/28/filelists/files
index c62f6e230..6eeb9c8ab 100644
--- a/config/rootfiles/core/28/filelists/files
+++ b/config/rootfiles/core/28/filelists/files
@@ -1,7 +1,10 @@
 bin/probenic.sh
+etc/collectd.conf
+etc/collectd.thermal
 etc/ntp
 etc/rc.d/init.d/beep
 etc/rc.d/init.d/console
+etc/rc.d/init.d/collectd
 etc/rc.d/init.d/snort
 etc/rc.d/init.d/networking/red
 etc/ssh/moduli
diff --git a/lfs/collectd b/lfs/collectd
index 7154b1cd5..07dc4d96e 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--enable-{tcpconns,unixsock,users,wireless} \
 		--with-rrdtool=/usr/share/rrdtool-1.2.15
 	cd $(DIR_APP) && make install
-	cp -vf $(DIR_SRC)/config/collectd/collectd.conf /etc/
+	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
 	ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd 
 	ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S21collectd
 	ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd 
diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd
index eeaa3860b..cf02acbe3 100644
--- a/src/initscripts/init.d/collectd
+++ b/src/initscripts/init.d/collectd
@@ -13,7 +13,7 @@ fi
 
 case "$1" in
 	start)
-		# If run from init and collectd already started then exit silent
+		# If run from init and collectd alrady started then exit silent
 		if [ "$(basename $0)" != "collectd" ]; then
 			if [ "$(ps -A | grep " collectd$")" != "" ]; then
 				exit 0
@@ -43,8 +43,8 @@ case "$1" in
 		fi
 
 		# Load sensor modules only first start
-		if [ ! -e /var/lock/sensor_modules ]; then
-			touch /var/lock/sensor_modules
+		if [ ! -e /var/lock/sensors_modules ]; then
+			touch /var/lock/sensors_modules
 			boot_mesg -n "Loading Sensor Modules: "
 			for modul in `cat /etc/sysconfig/lm_sensors | grep '^MODULE_' | cut -d"=" -s -f2`; do
 			modprobe $modul > /dev/null 2>&1;
@@ -67,9 +67,9 @@ case "$1" in
 
 		# Enable thermal plugin if thermal_zone found
 		if [ ! -e  /sys/class/thermal/thermal_zone0 ]; then
-			sed -i -e "s|^LoadPlugin thermal|#LoadPlugin thermal|g" /etc/collectd.conf
+			sed -i -e 's|^include "/etc/collectd.thermal"$|#include "/etc/collectd.thermal"|g' /etc/collectd.conf
 		else
-			sed -i -e "s|^#LoadPlugin thermal|LoadPlugin thermal|g" /etc/collectd.conf
+			sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf
 		fi
 
 		# Enable swap plugin if swap found