diff -ur src.o/usr.sbin/config/main.c src/usr.sbin/config/main.c
--- src.o/usr.sbin/config/main.c	Sun May 13 00:37:52 2007
+++ src/usr.sbin/config/main.c	Mon May 14 01:48:08 2007
@@ -402,18 +402,18 @@
 
 	asprintf(&lend, "\\n\\\n");
 	assert(lend != NULL);
-	sbuf_printf(sb, "options\t%s%s", OPT_AUTOGEN, lend);
-	sbuf_printf(sb, "ident\t%s%s", ident, lend);
-	sbuf_printf(sb, "machine\t%s%s", machinename, lend);
+	sbuf_printf(sb, "options \t%s%s", OPT_AUTOGEN, lend);
+	sbuf_printf(sb, "ident \t%s%s", ident, lend);
+	sbuf_printf(sb, "machine \t%s%s", machinename, lend);
 	SLIST_FOREACH(cput, &cputype, cpu_next)
-		sbuf_printf(sb, "cpu\t%s%s", cput->cpu_name, lend);
+		sbuf_printf(sb, "cpu \t%s%s", cput->cpu_name, lend);
 	SLIST_FOREACH(ol, &mkopt, op_next)
-		sbuf_printf(sb, "makeoptions\t%s=%s%s", ol->op_name,
+		sbuf_printf(sb, "makeoptions \t%s=%s%s", ol->op_name,
 		    ol->op_value, lend);
 	SLIST_FOREACH(ol, &opt, op_next) {
 		if (strncmp(ol->op_name, "DEV_", 4) == 0)
 			continue;
-		sbuf_printf(sb, "options\t%s", ol->op_name);
+		sbuf_printf(sb, "options \t%s", ol->op_name);
 		if (ol->op_value != NULL) {
 			sbuf_putc(sb, '=');
 			for (i = 0; i < strlen(ol->op_value); i++) {
@@ -433,7 +433,7 @@
 	 * Mark this file as containing everything we need.
 	 */
 	STAILQ_FOREACH(d, &dtab, d_next)
-		sbuf_printf(sb, "device\t%s%s", d->d_name, lend);
+		sbuf_printf(sb, "device \t%s%s", d->d_name, lend);
 	free(lend);
 }