diff --git a/ipmitool/lib/ipmi_sdr.c b/ipmitool/lib/ipmi_sdr.c
index 2e24f7b..c0ac29b 100644
--- a/ipmitool/lib/ipmi_sdr.c
+++ b/ipmitool/lib/ipmi_sdr.c
@@ -476,8 +476,14 @@ ipmi_sdr_print_sensors(struct ipmi_intf * intf, int do_unit)
 			}
 			printf("%s", sval);
 
-			if (do_unit && validread)
-				printf(" %s", unitstr);
+			if (validread) {
+				if (csv_output)
+					printf(",");
+				else
+					printf(" ");
+				if (do_unit)
+					printf("%s", unitstr);
+			}
 
 			if (csv_output)
 				printf(",");