diff --git a/CHANGES b/CHANGES
index 62cafd60..3eb84d40 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ lm-sensors CHANGES file
 
 SVN-HEAD
   pwmconfig: Exit immediately if not root
+  sensors.conf.default: Encourage user to not modify this file
 
 3.1.1 (2009-06-21)
   isadump: Use geteuid instead of getuid so that setuid bit works
diff --git a/etc/sensors.conf.default b/etc/sensors.conf.default
index 96db52f8..d25ae31a 100644
--- a/etc/sensors.conf.default
+++ b/etc/sensors.conf.default
@@ -5,7 +5,11 @@
 # differ from one mainboard to the next. Only label, compute and set
 # statements for internal voltage and temperature sensors are included.
 #
-# Better configuration files for specific mainboards can be found at
+# In general, local changes should not be added to this file, but rather
+# placed in custom configuration files located in /etc/sensors.d. This
+# approach makes further updates much easier.
+#
+# Such custom configuration files for specific mainboards can be found at
 # http://www.lm-sensors.org/wiki/Configurations
 
 chip "lm78-*" "lm79-*" "lm80-*"