diff --git a/CHANGES b/CHANGES
index 97840904..92662c5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,12 +20,14 @@ ask CVS about it:
 2.9.3 (2005????)
   File doc/busses/i2c-viapro: Update (2.6 backport)
   File doc/chips/via686a: Update (2.6 backport)
+  File etc/sensors.conf.eg: Do not set vrm by default
   File i2c-dev.h: Fix union i2c_smbus_data definition
                   Sync i2c_msg definition with i2c.h (Hideki Iwamoto)
                   Add missing parentheses around macros
                   Drop I2C_FUNC_SMBUS_EMUL
                   Drop I2C_FUNC_SMBUS_*_PEC
                   Drop I2C_SMBUS_*_PEC
+  File sensors_vid.h: Drop default VRM
   Library: Big update to use libsysfs.  More TODO though.
            Fix bus matching code for Linux 2.6 (Karsten Petersen)
            Add f71805f support
@@ -54,8 +56,12 @@ ask CVS about it:
                Add PEC support for the ADM1032
   Module via686a: Cleanups
   Module w83627hf: Drop useless initialization step (2.6 backport)
+                   Fix in4 for W83627THF and W83637HF (Yuan Mu)
+                   Fix alarms (Yuan Mu)
+                   Preserve fan min on fan div change (Yuan Mu)
   Module w83781d: Drop W83697HF support (Grant Coady)
   Module w83l785ts: Minor cleanup (2.6 backport)
+  Modules vt1211, vt8231: Change default VRM to 9.1
   Program decode-dimms.pl: Add lookup tables for manufacturer names
                            Fix rounding error in PCxxxx speed computation
   Program i2cdump: Drop now useless #ifdef tests
diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg
index e2c627a1..abc6cc6e 100644
--- a/etc/sensors.conf.eg
+++ b/etc/sensors.conf.eg
@@ -1981,7 +1981,9 @@ chip "vt1211-*" "vt8231-*"
     compute in4 ((@ * 100) - 3) / (0.1754 * 95.8), (@ * 0.1754 * 0.958) + .03
     compute in5 ((@ * 100) - 3) / (0.6296 * 95.8), (@ * 0.6296 * 0.958) + .03
 
-    set vrm 9.1
+# adjust this if your vid is wrong; see doc/vid
+#   set vrm 9.1
+
 #   set in0_min 2.5 * 0.95
 #   set in0_max 2.5 * 1.05
 #   set in1_min 2.5 * 0.95
@@ -2051,7 +2053,8 @@ chip "smsc47m1-*"
 # This example was tested vs. Asus P4S333
 #
 chip "asb100-*"
-    set vrm 9.0
+# adjust this if your vid is wrong; see doc/vid
+    #set vrm 9.0
 
     label in0 "VCore 1"
     set in0_min vid * 0.95
@@ -2171,7 +2174,8 @@ chip "lm85c-*" "adm1027-*" "adt7463-*" "lm85-*" "lm85b-*"
 #   ignore fan4
 
 # Set VRM version
-   set vrm  9.1   # Pentium 4
+# adjust this if your vid is wrong; see doc/vid
+#   set vrm  9.1   # Pentium 4
 
 # Set voltage limits
    set in0_min  1.5 * 0.95
diff --git a/kernel/chips/asb100.c b/kernel/chips/asb100.c
index 5ef079d3..824bc64b 100644
--- a/kernel/chips/asb100.c
+++ b/kernel/chips/asb100.c
@@ -59,7 +59,7 @@ static unsigned short normal_i2c_range[] = { SENSORS_I2C_END };
 static unsigned int normal_isa[] = { SENSORS_ISA_END };
 static unsigned int normal_isa_range[] = { SENSORS_ISA_END };
 
-/* default VRM to 9.0 instead of 8.2 */
+/* default VRM to 9.0 */
 #define ASB100_DEFAULT_VRM 90
 
 /* Insmod parameters */
diff --git a/kernel/chips/lm87.c b/kernel/chips/lm87.c
index f325478a..b4100832 100644
--- a/kernel/chips/lm87.c
+++ b/kernel/chips/lm87.c
@@ -548,7 +548,7 @@ static void lm87_init_client(struct i2c_client *client)
 #endif
 	);
 
-	data->vrm = DEFAULT_VRM;
+	data->vrm = 82;
 
 	/* Start monitoring */
 	reg = lm87_read_value(client, LM87_REG_CONFIG);
diff --git a/kernel/chips/vt1211.c b/kernel/chips/vt1211.c
index 3205ee4e..35a51386 100644
--- a/kernel/chips/vt1211.c
+++ b/kernel/chips/vt1211.c
@@ -479,7 +479,7 @@ static void vt1211_init_client(struct i2c_client *client)
 {
 	struct vt1211_data *data = client->data;
 
-	data->vrm = DEFAULT_VRM;
+	data->vrm = 91;
 	/* set "default" interrupt mode for alarms, which isn't the default */
 	vt1211_write_value(client, VT1211_REG_TEMP1_CONFIG, 0);
 	vt1211_write_value(client, VT1211_REG_TEMP2_CONFIG, 0);
diff --git a/kernel/chips/vt8231.c b/kernel/chips/vt8231.c
index 261602ad..f807d661 100644
--- a/kernel/chips/vt8231.c
+++ b/kernel/chips/vt8231.c
@@ -451,7 +451,7 @@ static void vt8231_init_client(struct i2c_client *client)
 {
 	struct vt8231_data *data = client->data;
 
-	data->vrm = DEFAULT_VRM;
+	data->vrm = 91;
 	/* set "default" interrupt mode for alarms, which isn't the default */
 	vt8231_write_value(client, VT8231_REG_TEMP1_CONFIG, 0);
 	vt8231_write_value(client, VT8231_REG_TEMP2_CONFIG, 0);
diff --git a/kernel/include/sensors_vid.h b/kernel/include/sensors_vid.h
index e6380e5f..a695fc40 100644
--- a/kernel/include/sensors_vid.h
+++ b/kernel/include/sensors_vid.h
@@ -51,8 +51,6 @@
     to avoid floating point in the kernel.
 */
 
-#define DEFAULT_VRM	82
-
 static inline int vid_from_reg(int val, int vrm)
 {
 	int vid;