diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 1b74554591ef..5708ff3558f0 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\"	$Id$
+.\"	$Id: nfsiod.8,v 1.5 1997/02/22 14:33:05 peter Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
@@ -53,7 +53,7 @@ It improves performance but is not required for correct operation.
 Unless otherwise specified, a single server is started.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl n
 Specify how many servers are to be started.
 .El
@@ -62,7 +62,7 @@ A client should run enough daemons to handle its maximum
 level of concurrency, typically four to six.
 .Pp
 If
-.Nm nfsiod
+.Nm
 detects that the running kernel does not include
 .Tn NFS
 support, it will attempt to load a loadable kernel module containing
@@ -74,11 +74,11 @@ by way of
 If this fails, or no
 .Tn NFS
 LKM was available,
-.Nm nfsiod
+.Nm
 exits with an error.
 .Pp
 The
-.Nm nfsiod
+.Nm
 utility exits 0 on success, and >0 if an error occurs.
 .Sh SEE ALSO
 .Xr nfsstat 1 ,
@@ -88,6 +88,6 @@ utility exits 0 on success, and >0 if an error occurs.
 .Xr portmap 8
 .Sh HISTORY
 The
-.Nm nfsiod
+.Nm
 utility first appeared in
 .Bx 4.4 .
diff --git a/sbin/nfsiod/nfsiod.c b/sbin/nfsiod/nfsiod.c
index 6ddb42a6b5eb..b97eb77718ef 100644
--- a/sbin/nfsiod/nfsiod.c
+++ b/sbin/nfsiod/nfsiod.c
@@ -35,31 +35,29 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif not lint
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)nfsiod.c	8.4 (Berkeley) 5/3/95";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif not lint
 
 #include <sys/param.h>
-#include <sys/ioctl.h>
 #include <sys/syslog.h>
-#include <sys/ucred.h>
 #include <sys/wait.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 
 #include <nfs/rpcv2.h>
-#include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 
 #include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -164,7 +162,7 @@ void
 nonfs(signo)
 	int signo;
 {
-	syslog(LOG_ERR, "missing system call: NFS not available.");
+	syslog(LOG_ERR, "missing system call: NFS not available");
 }
 
 void