diff --git a/usr.bin/ctlstat/ctlstat.c b/usr.bin/ctlstat/ctlstat.c
index e04aa5405bb1..3bfb24884357 100644
--- a/usr.bin/ctlstat/ctlstat.c
+++ b/usr.bin/ctlstat/ctlstat.c
@@ -449,7 +449,7 @@ ctlstat_standard(struct ctlstat_context *ctx) {
 					(F_LUNVAL(ctx) != 0) ? "     " : "",
 					(F_LUNVAL(ctx) != 0) ? "     " : "",
 					(F_LUNVAL(ctx) != 0) ? "     " : "",
-					(F_CPU(ctx) == 0)   ? "    CPU" : "");
+					(F_CPU(ctx))   ? "    CPU" : "");
 				hdr_devs = 3;
 			} else {
 				if (F_CPU(ctx))
@@ -468,8 +468,9 @@ ctlstat_standard(struct ctlstat_context *ctx) {
 
 					if (bit_test(ctx->lun_mask, lun) == 0)
 						continue;
-					fprintf(stdout, "%15.6s%d ",
-						"lun", lun);
+					fprintf(stdout, "%15.6s%d %s",
+					    "lun", lun,
+					    (F_LUNVAL(ctx) != 0) ? "     " : "");
 					hdr_devs++;
 				}
 				fprintf(stdout, "\n");