diff --git a/CHANGES b/CHANGES
index ddf65b15..3e7405b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -53,6 +53,7 @@ SVN-HEAD
                   Skip IPMI probing on laptops
                   Add Winbond/Nuvoton W83667HG support
                   Add Intel Core I7 support
+                  Generate new format for /etc/sysconfig/lm_sensors
   sensors-detect-stat.pl: Delete (functionality merged into sensors-detect)
 
 3.0.3 (2008-09-28)
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 94a77547..966fe7c8 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -5348,9 +5348,20 @@ sub main
 # This file is sourced by /etc/init.d/lm_sensors and defines the modules to
 # be loaded/unloaded.
 #
-# The format of this file is a shell script that simply defines the modules
-# in order as normal variables with the special names:
+# The format of this file is a shell script that simply defines variables:
+# HWMON_MODULES for hardware monitoring driver modules, and optionally
+# BUS_MODULES for any required bus driver module (for example for I2C or SPI).
+
+EOT
+		print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
+			if @{$bus_modules};
+		print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
+
+		print SYSCONFIG <<'EOT';
+
+# For compatibility reasons, modules are also listed individually as variables
 #    MODULE_0, MODULE_1, MODULE_2, etc.
+# You should use BUS_MODULES and HWMON_MODULES instead if possible.
 
 EOT
 		my $i = 0;