diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -249,7 +249,7 @@
 		sblock.fs_fragshift++;
 	if (sblock.fs_frag > MAXFRAG) {
 		printf("fragment size %d is too small, "
-			"minimum with block size %d is %d\n",
+		    "minimum with block size %d is %d\n",
 		    sblock.fs_fsize, sblock.fs_bsize,
 		    sblock.fs_bsize / MAXFRAG);
 		exit(21);
@@ -291,7 +291,7 @@
 
 	sblock.fs_sblkno =
 	    roundup(howmany(sblock.fs_sblockloc + SBLOCKSIZE, sblock.fs_fsize),
-		sblock.fs_frag);
+	    sblock.fs_frag);
 	sblock.fs_cblkno = (daddr_t)(sblock.fs_sblkno +
 	    roundup(howmany(SBLOCKSIZE, sblock.fs_fsize), sblock.fs_frag));
 	sblock.fs_iblkno = sblock.fs_cblkno + sblock.fs_frag;
@@ -487,12 +487,12 @@
 	 */
 #define	B2MBFACTOR (1 / (1024.0 * 1024.0))
 	printf("%s: %.1fMB (%lld sectors) block size %d, "
-	       "fragment size %d\n",
+	    "fragment size %d\n",
 	    fsys, (float)sblock.fs_size * sblock.fs_fsize * B2MBFACTOR,
 	    (long long)fsbtodb(&sblock, sblock.fs_size),
 	    sblock.fs_bsize, sblock.fs_fsize);
 	printf("\tusing %d cylinder groups of %.2fMB, %d blks, "
-	       "%d inodes.\n",
+	    "%d inodes.\n",
 	    sblock.fs_ncg,
 	    (float)sblock.fs_fpg * sblock.fs_fsize * B2MBFACTOR,
 	    sblock.fs_fpg / sblock.fs_frag, sblock.fs_ipg);
@@ -503,7 +503,7 @@
 	 * subwindows in sysinst.
 	 */
 	printcolwidth = count_digits(
-			fsbtodb(&sblock, cgsblock(&sblock, sblock.fs_ncg -1)));
+	    fsbtodb(&sblock, cgsblock(&sblock, sblock.fs_ncg -1)));
 	nprintcols = 76 / (printcolwidth + 2);
 
 	/*
@@ -529,8 +529,9 @@
 		initcg(cylno, tstamp, fsopts);
 		if (cylno % nprintcols == 0)
 			printf("\n");
-		printf(" %*lld,", printcolwidth,
-			(long long)fsbtodb(&sblock, cgsblock(&sblock, cylno)));
+		printf(" %*lld%s", printcolwidth,
+		    (long long)fsbtodb(&sblock, cgsblock(&sblock, cylno)),
+		    cylno == sblock.fs_ncg - 1 ? "" : ",");
 		fflush(stdout);
 	}
 	printf("\n");