Index: usr.sbin/acpi/acpiconf/acpiconf.c
===================================================================
--- usr.sbin/acpi/acpiconf/acpiconf.c
+++ usr.sbin/acpi/acpiconf/acpiconf.c
@@ -86,7 +86,7 @@
 {
 	union acpi_battery_ioctl_arg battio;
 	const char *pwr_units;
-	int hours, min, amp;
+	int hours, min, amp, space;
 	uint32_t volt;
 
 	if (num < 0 || num > 64)
@@ -137,14 +137,19 @@
 		err(EX_IOERR, "get battery user info (%d) failed", num);
 	if (battio.battinfo.state != ACPI_BATT_STAT_NOT_PRESENT) {
 		printf("State:\t\t\t");
+		space = 0;
 		if (battio.battinfo.state == 0)
-			printf("high ");
-		if (battio.battinfo.state & ACPI_BATT_STAT_CRITICAL)
-			printf("critical ");
-		if (battio.battinfo.state & ACPI_BATT_STAT_DISCHARG)
-			printf("discharging ");
+			printf("high");
+		if (battio.battinfo.state & ACPI_BATT_STAT_CRITICAL) {
+			printf("critical");
+			space = 1;
+		}
+		if (battio.battinfo.state & ACPI_BATT_STAT_DISCHARG) {
+			printf("%sdischarging", space ? " " : "");
+			space = 1;
+		}
 		if (battio.battinfo.state & ACPI_BATT_STAT_CHARGING)
-			printf("charging ");
+			printf("%scharging", space ? " " : "");
 		printf("\n");
 		if (battio.battinfo.cap == -1)
 			printf("Remaining capacity:\tunknown\n");