diff --git a/CHANGES b/CHANGES
index c400e2fa..0240333d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,7 +25,8 @@ ask CVS about it:
   File doc/FAQ: Many updates and additions
   File doc/chips/via686a: Claim support for 686b.
   File sensors.conf.eg: Adjust as99127f in5 (-12V) and temp2 calculations;
-                        Add lm87 template; enhance help comments in file
+                        Add lm87, adm9240, ds1780, lm81 templates;
+                        Enhance help comments in file
   File sensors.c: Add xxx_init() calls for drivers added to mkpatch in 2.5.5.
   Include file i2c-isa.h: No longer required, moved to i2c.h in i2c package
   Include file sensors.h: Most contents moved to i2c-proc.h in i2c package
diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg
index 84bfae29..30de6bb7 100644
--- a/etc/sensors.conf.eg
+++ b/etc/sensors.conf.eg
@@ -3,7 +3,8 @@
 #
 ##########################################################################
 #                                                                        #
-# HELPFUL HINT:                                                          #
+#    PLEASE READ THIS HELPFUL HINT!!!                                    #
+#                                                                        #
 #	The 'set' lines (generally for min and max values)               #
 #	do not take effect until you run 'sensors -s' as root !!!        #
 #	We suggest you put 'sensors -s' in a /etc/rc.d/... file          #
@@ -50,7 +51,14 @@
 # Feature names are used in 'label', 'compute', 'set', and 'ignore' lines.
 # Example feature names are 'in0', 'temp2', 'in3_min', and 'temp3_over'.
 # These features are defined for each chip in lib/chips.c.
-# Undefined features will be silently ignored!!!!
+#
+# Undefined features will be silently ignored in 'label' and 'compute' lines.
+# Undefined features in 'set' lines will result in 'Unknonw feature name'
+# when running 'sensors -s'.
+#
+# Unfortunately, feature names starting with a number must be in
+# double quotes or you get 'parse error, expecting 'NAME''.
+#
 # If you have trouble, verify the features in lib/chips.c!!!
 #
 #
@@ -198,6 +206,7 @@
 ##########################################################################
 #### Here begins the real configuration file
 
+
 chip "lm78-*" "lm78-j-*" "lm79-*" "w83781d-*" "sis5595-*"
 
 # These are as advised in the LM78 and LM79 data sheets, and used on almost
@@ -271,6 +280,7 @@ chip "lm78-*" "lm78-j-*" "lm79-*" "w83781d-*" "sis5595-*"
 #    set temp3_over 52	
 #    set temp3_hyst 47	
 
+
 chip "w83782d-*" "w83783s-*" "w83627hf-*"
 
 # Same as above for w83781d except that in5 and in6 are computed differently.
@@ -412,6 +422,7 @@ chip "gl518sm-*"
   set fan2_min 0
   set iterate 0
 
+
 chip "gl520sm-*"
 
 # Factors and labels taken from GL520SM datasheet
@@ -445,6 +456,7 @@ chip "gl520sm-*"
   set vin3_max 2.30
   set two_temps 1
 
+
 chip "lm80-*"
     
 # The values below should be correct if you own a qdi BX (brilliant1)
@@ -518,6 +530,7 @@ chip "lm80-*"
 #    set temp_os_hyst  57	
 #    set temp_os_max   62	
 
+
 chip "maxilife-cg-*" "maxilife-co-*" "maxilife-as-*"
 
    label fan1  "HDD Fan"
@@ -538,6 +551,7 @@ chip "maxilife-cg-*" "maxilife-co-*" "maxilife-as-*"
 
    compute vid1 6.337*@ , @/6.337
 
+
 chip "maxilife-cg-*"
 
    ignore temp1
@@ -547,6 +561,7 @@ chip "maxilife-cg-*"
    label vid3   "Vcpu2"
    ignore vid4
 
+
 chip "maxilife-co-*"
 
    label temp1  "CPU 1 Temp"
@@ -556,6 +571,7 @@ chip "maxilife-co-*"
    label vid3   "Vcpu2"
    label vid4   "VcacheL2"
 
+
 chip "maxilife-as-*"
 
    ignore temp1
@@ -565,6 +581,7 @@ chip "maxilife-as-*"
    ignore vid3
    ignore vid4
 
+
 chip "maxilife-nba-*"
 
    label fan1  "CPU Fan"
@@ -585,6 +602,7 @@ chip "maxilife-nba-*"
    label vid4  "VcacheL2"
    label vid5  "V-12"
 
+
 chip "via686a-*"
 
 # VIA is very specific about the voltage sensor inputs, and our labels
@@ -667,6 +685,7 @@ chip "via686a-*"
   #compute "5.0V" 1.009*@  ,  @/1.009
   #compute "12V" 1.04*@ ,  @/1.04
 
+
 chip "mtp008-*"
     
 # The values below should be correct if you own a Tyan S1834D motherboard.  If
@@ -713,6 +732,7 @@ chip "mtp008-*"
 #    set temp3_over 52	
 #    set temp3_hyst 47	
 
+
 chip "adm1025-*"
 
 # These are as advised in the data sheet
@@ -734,15 +754,19 @@ chip "lm87-*"
 # For this chip, libsensors anticipates the correct labeling.
 # This is great if it's correct but makes it a little more
 # difficult if you want to change it.
+#
 # This may not have been a good idea, so it may be changed in the future.
 # Here is an entry with everything commented out so you can
 # uncomment the appropriate line if you want to change it.
 #
-#   label 2.5V "xxx"
+# Warning - feature names starting with a number must be enclosed
+# with double quotes.
+#
+#   label "2.5V" "xxx"
 #   label Vccp1 "xxx"
-#   label 3.3V "xxx"
-#   label 5V "xxx"
-#   label 12V "xxx"
+#   label "3.3V" "xxx"
+#   label "5V" "xxx"
+#   label "12V" "xxx"
 #   label Vccp2 "xxx"
 #   label AIN1 "xxx"
 #   label AIN2 "xxx"
@@ -754,20 +778,22 @@ chip "lm87-*"
 #
 #   set AmbTemp_min xxx
 #   set Vccp1_min xxx
-#   set 3.3V_min xxx
-#   set 5V_min xxx
-#   set 12V_min xxx
+#   set "3.3V_min" xxx
+#   set "5V_min" xxx
+#   set "12V_min" xxx
 #   set Vccp2_min xxx
 #   set AIN1_min xxx
 #   set AIN2_min xxx
+#
 #   set AmbTemp_max xxx
 #   set Vccp1_max xxx
-#   set 3.3V_max xxx
-#   set 5V_max xxx
-#   set 12V_max xxx
+#   set "3.3V_max" xxx
+#   set "5V_max" xxx
+#   set "12V_max" xxx
 #   set Vccp2_max xxx
 #   set AIN1_max xxx
 #   set AIN2_max xxx
+#
 #   set fan1_min xxx
 #   set fan2_min xxx
 #   set temp1_min xxx
@@ -779,14 +805,69 @@ chip "lm87-*"
 #   set fan1_div xxx
 #   set fan2_div xxx
 
-#   compute 2.5V xxx
+#   compute "2.5V" xxx
 #   compute Vccp1 xxx
-#   compute 3.3V xxx
-#   compute 5V xxx
-#   compute 12V xxx
+#   compute "3.3V" xxx
+#   compute "5V" xxx
+#   compute "12V" xxx
 #   compute Vccp2 xxx
 #   compute AIN1 xxx
 #   compute AIN2 xxx
 #   compute temp1 xxx
 #   compute CPU_Temp xxx
 #   compute CPU2_Temp xxx
+
+
+chip "adm9240-*" "ds1780-*" "lm81-*"
+#
+# This chip has non-standard entries in lib/chips.c so
+# the feature names are quite different from other chips.
+# For this chip, libsensors anticipates the correct labeling.
+# This is great if it's correct but makes it a little more
+# difficult if you want to change it.
+#
+# This may not have been a good idea, so it may be changed in the future.
+# Here is an entry with everything commented out so you can
+# uncomment the appropriate line if you want to change it.
+#
+# Warning - feature names starting with a number must be enclosed
+# with double quotes.
+#
+#   label "2.5V" "xxx"
+#   label Vccp1 "xxx"
+#   label "3.3V" "xxx"
+#   label "5V" "xxx"
+#   label "12V" "xxx"
+#   label Vccp2 "xxx"
+#   label fan1 "xxx"
+#   label fan2 "xxx"
+#   label temp "xxx"
+#
+#   set Vccp1_min xxx
+#   set "2.5V_min" xxx
+#   set "3.3V_min" xxx
+#   set "5V_min" xxx
+#   set "12V_min" xxx
+#   set Vccp2_min xxx
+#
+#   set Vccp1_max xxx
+#   set "2.5V_max" xxx
+#   set "3.3V_max" xxx
+#   set "5V_max" xxx
+#   set "12V_max" xxx
+#   set Vccp2_max xxx
+#
+#   set fan1_min xxx
+#   set fan2_min xxx
+#   set temp1_hyst xxx
+#   set temp1_over xxx
+#   set fan1_div xxx
+#   set fan2_div xxx
+
+#   compute "2.5V" xxx
+#   compute Vccp1 xxx
+#   compute "3.3V" xxx
+#   compute "5V" xxx
+#   compute "12V" xxx
+#   compute Vccp2 xxx
+#   compute temp xxx