diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 3d014475607d..42ca903df9b9 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -30,6 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
+.\"	$Id$
 .\"
 .Dd December 11, 1993
 .Dt TUNEFS 8
@@ -46,23 +47,23 @@
 .Op Fl m Ar minfree
 .Op Fl p
 .Bk -words
-.Op Fl n Ar soft_dependency_enabling
+.Op Fl n Ar enable | disable
 .Op Fl o Ar optimize_preference
 .Ek
-.Op Ar special | Ar filesys
+.Op Ar special | Ar filesystem
 .Sh DESCRIPTION
 .Nm Tunefs
 is designed to change the dynamic parameters of a file system
 which affect the layout policies.
 The parameters which are to be changed are indicated by the flags
 given below:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl A
 The file system has several backups of the super-block.  Specifying
 this option will cause all backups to be modified as well as the
 primary super-block.  This is potentially dangerous - use with caution.
 .It Fl a Ar maxcontig
-This specifies the maximum number of contiguous blocks that will
+Specify the maximum number of contiguous blocks that will
 be laid out before forcing a rotational delay (see
 .Fl d
 below).
@@ -71,13 +72,13 @@ an interrupt per disk transfer.
 Device drivers that can chain several buffers together in a single
 transfer should set this to the maximum chain length.
 .It Fl d Ar rotdelay
-This specifies the expected time (in milliseconds)
+Specify the expected time (in milliseconds)
 to service a transfer completion
 interrupt and initiate a new transfer on the same disk.
 It is used to decide how much rotational spacing to place between
 successive blocks in a file.
 .It Fl e Ar maxbpg
-This indicates the maximum number of blocks any single file can
+Indicate the maximum number of blocks any single file can
 allocate out of a cylinder group before it is forced to begin
 allocating blocks from another cylinder group.
 Typically this value is set to about one quarter of the total blocks
@@ -92,7 +93,7 @@ in a cylinder group before seeking elsewhere.
 For file systems with exclusively large files,
 this parameter should be set higher.
 .It Fl m Ar minfree
-This value specifies the percentage of space held back
+Specify the percentage of space held back
 from normal users; the minimum free space threshold.
 The default value used is 8%.
 This value can be set to zero, however up to a factor of three
@@ -103,6 +104,8 @@ writes.
 Note that if the value is raised above the current usage level,
 users will be unable to allocate files until enough files have
 been deleted to get under the higher threshold.
+.It Fl n Ar enable | disable
+Turn on/off soft updates. An unmounted filesystem is required.
 .It Fl o Ar optimize_preference
 The file system can either try to minimize the time spent
 allocating blocks, or it can attempt to minimize the space
@@ -111,7 +114,7 @@ higher overhead for file writes.
 The kernel normally changes the preference automatically as
 the percent fragmentation changes on the file system.
 .It Fl p
-This option shows a summary of what the current tuneable settings
+Show a summary of what the current tunable settings
 are on the selected file system.  More detailed information can be
 obtained in the
 .Xr dumpfs 8
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index b1df99b324c9..682c6e2fc4f3 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -32,13 +32,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
@@ -49,12 +53,11 @@ static char sccsid[] = "@(#)tunefs.c	8.2 (Berkeley) 4/19/94";
 
 #include <ufs/ffs/fs.h>
 
-#include <errno.h>
 #include <err.h>
 #include <fcntl.h>
 #include <fstab.h>
-#include <stdio.h>
 #include <paths.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
@@ -248,16 +251,10 @@ main(argc, argv)
 void
 usage()
 {
-
-	fprintf(stderr, "usage: tunefs tuneup-options special-device\n");
-	fprintf(stderr, "where tuneup-options are:\n");
-	fprintf(stderr, "\t-a maximum contiguous blocks\n");
-	fprintf(stderr, "\t-d rotational delay between contiguous blocks\n");
-	fprintf(stderr, "\t-e maximum blocks per file in a cylinder group\n");
-	fprintf(stderr, "\t-m minimum percentage of free space\n");
-	fprintf(stderr, "\t-n soft updates (`enable' or `disable')\n");
-	fprintf(stderr, "\t-o optimization preference (`space' or `time')\n");
-	fprintf(stderr, "\t-p no change - just prints current tuneable settings\n");
+	fprintf(stderr, "%s\n%s\n%s\n",
+"usage: tunefs [-A] [-a maxcontig] [-d rotdelay] [-e maxbpg] [-m minfree]",
+"              [-p] [-n enable | disable] [-o optimize_preference]",
+"              [special | filesystem]");
 	exit(2);
 }