diff --git a/lib/chips.c b/lib/chips.c
index e92d46b1..03218fd0 100644
--- a/lib/chips.c
+++ b/lib/chips.c
@@ -3539,39 +3539,39 @@ static sensors_chip_feature adm1027_features[] =
 static sensors_chip_feature lm87_features[] =
   { 
     { SENSORS_LM87_IN0, "2.5V", NOMAP, NOMAP,
-                        R, LM87_SYSCTL_IN0, VALUE(3), 2 },
+                        R, LM87_SYSCTL_IN0, VALUE(3), 2, "in0_input", 3 },
     { SENSORS_LM87_IN1, "Vccp1", NOMAP, NOMAP,
-                        R, LM87_SYSCTL_IN1, VALUE(3), 2 },
+                        R, LM87_SYSCTL_IN1, VALUE(3), 2, "in1_input", 3 },
     { SENSORS_LM87_IN2, "3.3V", NOMAP, NOMAP,
-                        R, LM87_SYSCTL_IN2, VALUE(3), 2 },
+                        R, LM87_SYSCTL_IN2, VALUE(3), 2, "in2_input", 3 },
     { SENSORS_LM87_IN3, "5V", NOMAP, NOMAP,
-                        R, LM87_SYSCTL_IN3, VALUE(3), 2 },
+                        R, LM87_SYSCTL_IN3, VALUE(3), 2, "in3_input", 3 },
     { SENSORS_LM87_IN4, "12V", NOMAP, NOMAP,
-                        R, LM87_SYSCTL_IN4, VALUE(3), 2 },
+                        R, LM87_SYSCTL_IN4, VALUE(3), 2, "in4_input", 3 },
     { SENSORS_LM87_IN5, "Vccp2", NOMAP, NOMAP,
-                        R, LM87_SYSCTL_IN5, VALUE(3), 2 },
+                        R, LM87_SYSCTL_IN5, VALUE(3), 2, "in5_input", 3 },
     { SENSORS_LM87_AIN1, "AIN1", NOMAP, NOMAP,
                         R, LM87_SYSCTL_AIN1, VALUE(3), 0 },
     { SENSORS_LM87_AIN2, "AIN2", NOMAP, NOMAP,
                         R, LM87_SYSCTL_AIN2, VALUE(3), 0 },
     { SENSORS_LM87_IN0_MIN, "AmbTemp_min", SENSORS_LM87_IN0, 
                         SENSORS_LM87_IN0, RW, 
-                        LM87_SYSCTL_IN0, VALUE(1), 2 },
+                        LM87_SYSCTL_IN0, VALUE(1), 2, "in0_min", 3 },
     { SENSORS_LM87_IN1_MIN, "Vccp1_min", SENSORS_LM87_IN1, 
                         SENSORS_LM87_IN1, RW, 
-                        LM87_SYSCTL_IN1, VALUE(1), 2 },
+                        LM87_SYSCTL_IN1, VALUE(1), 2, "in1_min", 3 },
     { SENSORS_LM87_IN2_MIN, "3.3V_min", SENSORS_LM87_IN2, 
                         SENSORS_LM87_IN2, RW, 
-                        LM87_SYSCTL_IN2, VALUE(1), 2 },
+                        LM87_SYSCTL_IN2, VALUE(1), 2, "in2_min", 3 },
     { SENSORS_LM87_IN3_MIN, "5V_min", SENSORS_LM87_IN3, 
                         SENSORS_LM87_IN3, RW, 
-                        LM87_SYSCTL_IN3, VALUE(1), 2 },
+                        LM87_SYSCTL_IN3, VALUE(1), 2, "in3_min", 3 },
     { SENSORS_LM87_IN4_MIN, "12V_min", SENSORS_LM87_IN4, 
                         SENSORS_LM87_IN4, RW, 
-                        LM87_SYSCTL_IN4, VALUE(1), 2 },
+                        LM87_SYSCTL_IN4, VALUE(1), 2, "in4_min", 3 },
     { SENSORS_LM87_IN5_MIN, "Vccp2_min", SENSORS_LM87_IN5, 
                         SENSORS_LM87_IN5, RW, 
-                        LM87_SYSCTL_IN5, VALUE(1), 2 },
+                        LM87_SYSCTL_IN5, VALUE(1), 2, "in5_min", 3 },
     { SENSORS_LM87_AIN1_MIN, "AIN1_min", SENSORS_LM87_AIN1, 
                         SENSORS_LM87_AIN1, RW, 
                         LM87_SYSCTL_AIN1, VALUE(1), 0 },
@@ -3580,22 +3580,22 @@ static sensors_chip_feature lm87_features[] =
                         LM87_SYSCTL_AIN2, VALUE(1), 0 },
     { SENSORS_LM87_IN0_MAX, "AmbTemp_max", SENSORS_LM87_IN0, 
                         SENSORS_LM87_IN0, RW,
-                        LM87_SYSCTL_IN0, VALUE(2), 2 },
+                        LM87_SYSCTL_IN0, VALUE(2), 2, "in0_max", 3 },
     { SENSORS_LM87_IN1_MAX, "Vccp1_max", SENSORS_LM87_IN1, 
                         SENSORS_LM87_IN1, RW, 
-                        LM87_SYSCTL_IN1, VALUE(2), 2 },
+                        LM87_SYSCTL_IN1, VALUE(2), 2, "in1_max", 3 },
     { SENSORS_LM87_IN2_MAX, "3.3V_max", SENSORS_LM87_IN2, 
                         SENSORS_LM87_IN2, RW, 
-                        LM87_SYSCTL_IN2, VALUE(2), 2 },
+                        LM87_SYSCTL_IN2, VALUE(2), 2, "in2_max", 3 },
     { SENSORS_LM87_IN3_MAX, "5V_max", SENSORS_LM87_IN3, 
                         SENSORS_LM87_IN3, RW, 
-                        LM87_SYSCTL_IN3, VALUE(2), 2 },
+                        LM87_SYSCTL_IN3, VALUE(2), 2, "in3_max", 3 },
     { SENSORS_LM87_IN4_MAX, "12V_max", SENSORS_LM87_IN4, 
                         SENSORS_LM87_IN4, RW,
-                        LM87_SYSCTL_IN4, VALUE(2), 2 },
+                        LM87_SYSCTL_IN4, VALUE(2), 2, "in4_max", 3 },
     { SENSORS_LM87_IN5_MAX, "Vccp2_max", SENSORS_LM87_IN5, 
                         SENSORS_LM87_IN5, RW, 
-                        LM87_SYSCTL_IN5, VALUE(2), 2 },
+                        LM87_SYSCTL_IN5, VALUE(2), 2, "in5_max", 3 },
     { SENSORS_LM87_AIN1_MAX, "AIN1_max", SENSORS_LM87_AIN1, 
                         SENSORS_LM87_AIN1, RW, 
                         LM87_SYSCTL_AIN1, VALUE(2), 0 },
@@ -3613,9 +3613,9 @@ static sensors_chip_feature lm87_features[] =
                         SENSORS_LM87_FAN2, RW, 
                         LM87_SYSCTL_FAN2, VALUE(1), 0 },
     { SENSORS_LM87_TEMP3, "CPU2_Temp", NOMAP, NOMAP,
-                         R, LM87_SYSCTL_TEMP3, VALUE(3), 1 },
+                         R, LM87_SYSCTL_TEMP3, VALUE(3), 1, "temp3_input", 3 },
     { SENSORS_LM87_TEMP2, "CPU_Temp", NOMAP, NOMAP, 
-                        R, LM87_SYSCTL_TEMP2, VALUE(3), 1 },
+                        R, LM87_SYSCTL_TEMP2, VALUE(3), 1, "temp2_input", 3 },
     { SENSORS_LM87_TEMP1, "temp1", NOMAP, NOMAP,
                          R, LM87_SYSCTL_TEMP1, VALUE(3), 1 },
     { SENSORS_LM87_TEMP1_HYST, "temp1_min", SENSORS_LM87_TEMP1,