diff --git a/CHANGES b/CHANGES
index 1387a20d..2305cfb7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,8 @@ SVN HEAD
                         Add a section for the W83627UHG
   sensors: Display 3 decimal places in raw output
            Add support for intrusion detection (#2370)
+           If an attribute value is 0, display the value with its base unit,
+           not with the minumum supported unit
   sensors-detect: Improve LM90 and W83L771 detection
                   Fix error seen if I2C bus numbers are not sequential
                   Add detection of SMSC EMC1423
diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c
index 3946e0e5..01c65323 100644
--- a/prog/sensors/chips.c
+++ b/prog/sensors/chips.c
@@ -441,6 +441,11 @@ static void scale_value(double *value, const char **prefixstr)
 	};
 	struct scale_table *scale = prefix_scales;
 
+	if (abs_value == 0) {
+		*prefixstr = "";
+		return;
+	}
+
 	while (scale->upper_bound && abs_value > scale->upper_bound) {
 		divisor = scale->upper_bound;
 		scale++;