diff --git a/CHANGES b/CHANGES
index ce222648..c776e846 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ SVN HEAD
   sensors: Added support for new sysfs attributes
            Display both instantaneous and average power if available.
            Report thermal sensor type 1 as CPU diode
+           Align power values better
   fancontrol: Support setup where one PWM output controls several fans
               Output error messages to stderr
   sensors-detect: Stop calling for PIIX5 SMBus testers
diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c
index debe5c5e..677a6178 100644
--- a/prog/sensors/chips.c
+++ b/prog/sensors/chips.c
@@ -570,7 +570,7 @@ static void print_chip_power(const sensors_chip_name *name,
 
 	if (sf && get_input_value(name, sf, &val) == 0) {
 		scale_value(&val, &unit);
-		printf("%6.2f %sW  ", val, unit);
+		printf("%6.2f %sW%*s", val, unit, 2 - (int)strlen(unit), "");
 	} else
 		printf("     N/A  ");