diff --git a/sbin/mount_portal/activate.c b/sbin/mount_portal/activate.c
index f14a4a3269c3..5bbd3b5a7106 100644
--- a/sbin/mount_portal/activate.c
+++ b/sbin/mount_portal/activate.c
@@ -35,20 +35,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)activate.c	8.3 (Berkeley) 4/28/95
- *
- * $Id: activate.c,v 1.3 1997/02/22 14:32:53 peter Exp $
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
-#include <signal.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/syslog.h>
 #include <sys/uio.h>
 
diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c
index b7f3e57dbf2d..3b0d965bd03a 100644
--- a/sbin/mount_portal/conf.c
+++ b/sbin/mount_portal/conf.c
@@ -35,16 +35,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
- *
- * $Id$
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sbin/mount_portal/mount_portal.8 b/sbin/mount_portal/mount_portal.8
index 5c1f17746dc6..ed9434e557fe 100644
--- a/sbin/mount_portal/mount_portal.8
+++ b/sbin/mount_portal/mount_portal.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\"
+.\"	$Id$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
@@ -50,12 +50,12 @@
 .Ar mount_point
 .Sh DESCRIPTION
 The
-.Nm mount_portal
+.Nm
 command attaches an instance of the portal daemon
 to the global filesystem namespace.
 The conventional mount point is
 .Pa /p .
-.PA /dev .
+.\" .PA /dev .
 This command is normally executed by
 .Xr mount 8
 at boot time.
@@ -132,6 +132,6 @@ fs/		file fs/
 This filesystem may not be NFS-exported.
 .Sh HISTORY
 The
-.Nm mount_portal
+.Nm
 utility first appeared in
 .Bx 4.4 .
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 4f489ed945ad..d3fa3c3a0dce 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -41,24 +41,23 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-/*
+#if 0
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
-*/
+#endif
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.11 1997/03/24 05:53:12 imp Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/stat.h>
 #include <sys/syslog.h>
 #include <sys/mount.h>
 
 #include <err.h>
 #include <errno.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c
index ae588ad54ef7..2f9ab9772a81 100644
--- a/sbin/mount_portal/pt_conf.c
+++ b/sbin/mount_portal/pt_conf.c
@@ -35,10 +35,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include "portald.h"
diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c
index 6ee2bf57a70c..6ee326d50a00 100644
--- a/sbin/mount_portal/pt_exec.c
+++ b/sbin/mount_portal/pt_exec.c
@@ -35,17 +35,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
- *
- * $Id$
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/syslog.h>
 
 #include "portald.h"
 
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index 9d71bc72997d..32207f31931e 100644
--- a/sbin/mount_portal/pt_file.c
+++ b/sbin/mount_portal/pt_file.c
@@ -35,16 +35,17 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_file.c	8.3 (Berkeley) 7/3/94
- *
- * $Id: pt_file.c,v 1.5 1997/02/22 14:32:56 peter Exp $
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c
index 494911c5657f..d62ca3eb31a7 100644
--- a/sbin/mount_portal/pt_tcp.c
+++ b/sbin/mount_portal/pt_tcp.c
@@ -35,15 +35,17 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_tcp.c	8.5 (Berkeley) 4/28/95
- *
- * $Id: pt_tcp.c,v 1.5 1997/03/11 12:35:00 peter Exp $
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
+#include <stdlib.h>
 #include <strings.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
@@ -59,7 +61,7 @@
  * Create a TCP socket connected to the
  * requested host and port.
  * Some trailing suffix values have special meanings.
- * An unrecognised suffix is an error.
+ * An unrecognized suffix is an error.
  */
 int portal_tcp(pcr, key, v, kso, fdp)
 	struct portal_cred *pcr;
diff --git a/sbin/mount_portalfs/activate.c b/sbin/mount_portalfs/activate.c
index f14a4a3269c3..5bbd3b5a7106 100644
--- a/sbin/mount_portalfs/activate.c
+++ b/sbin/mount_portalfs/activate.c
@@ -35,20 +35,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)activate.c	8.3 (Berkeley) 4/28/95
- *
- * $Id: activate.c,v 1.3 1997/02/22 14:32:53 peter Exp $
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
-#include <signal.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/syslog.h>
 #include <sys/uio.h>
 
diff --git a/sbin/mount_portalfs/conf.c b/sbin/mount_portalfs/conf.c
index b7f3e57dbf2d..3b0d965bd03a 100644
--- a/sbin/mount_portalfs/conf.c
+++ b/sbin/mount_portalfs/conf.c
@@ -35,16 +35,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
- *
- * $Id$
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/sbin/mount_portalfs/mount_portalfs.8 b/sbin/mount_portalfs/mount_portalfs.8
index 5c1f17746dc6..ed9434e557fe 100644
--- a/sbin/mount_portalfs/mount_portalfs.8
+++ b/sbin/mount_portalfs/mount_portalfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\"
+.\"	$Id$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
@@ -50,12 +50,12 @@
 .Ar mount_point
 .Sh DESCRIPTION
 The
-.Nm mount_portal
+.Nm
 command attaches an instance of the portal daemon
 to the global filesystem namespace.
 The conventional mount point is
 .Pa /p .
-.PA /dev .
+.\" .PA /dev .
 This command is normally executed by
 .Xr mount 8
 at boot time.
@@ -132,6 +132,6 @@ fs/		file fs/
 This filesystem may not be NFS-exported.
 .Sh HISTORY
 The
-.Nm mount_portal
+.Nm
 utility first appeared in
 .Bx 4.4 .
diff --git a/sbin/mount_portalfs/mount_portalfs.c b/sbin/mount_portalfs/mount_portalfs.c
index 4f489ed945ad..d3fa3c3a0dce 100644
--- a/sbin/mount_portalfs/mount_portalfs.c
+++ b/sbin/mount_portalfs/mount_portalfs.c
@@ -41,24 +41,23 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-/*
+#if 0
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
-*/
+#endif
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.11 1997/03/24 05:53:12 imp Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/stat.h>
 #include <sys/syslog.h>
 #include <sys/mount.h>
 
 #include <err.h>
 #include <errno.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sbin/mount_portalfs/pt_conf.c b/sbin/mount_portalfs/pt_conf.c
index ae588ad54ef7..2f9ab9772a81 100644
--- a/sbin/mount_portalfs/pt_conf.c
+++ b/sbin/mount_portalfs/pt_conf.c
@@ -35,10 +35,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include "portald.h"
diff --git a/sbin/mount_portalfs/pt_exec.c b/sbin/mount_portalfs/pt_exec.c
index 6ee2bf57a70c..6ee326d50a00 100644
--- a/sbin/mount_portalfs/pt_exec.c
+++ b/sbin/mount_portalfs/pt_exec.c
@@ -35,17 +35,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
- *
- * $Id$
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/syslog.h>
 
 #include "portald.h"
 
diff --git a/sbin/mount_portalfs/pt_file.c b/sbin/mount_portalfs/pt_file.c
index 9d71bc72997d..32207f31931e 100644
--- a/sbin/mount_portalfs/pt_file.c
+++ b/sbin/mount_portalfs/pt_file.c
@@ -35,16 +35,17 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_file.c	8.3 (Berkeley) 7/3/94
- *
- * $Id: pt_file.c,v 1.5 1997/02/22 14:32:56 peter Exp $
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/sbin/mount_portalfs/pt_tcp.c b/sbin/mount_portalfs/pt_tcp.c
index 494911c5657f..d62ca3eb31a7 100644
--- a/sbin/mount_portalfs/pt_tcp.c
+++ b/sbin/mount_portalfs/pt_tcp.c
@@ -35,15 +35,17 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_tcp.c	8.5 (Berkeley) 4/28/95
- *
- * $Id: pt_tcp.c,v 1.5 1997/03/11 12:35:00 peter Exp $
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
+#include <stdlib.h>
 #include <strings.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
@@ -59,7 +61,7 @@
  * Create a TCP socket connected to the
  * requested host and port.
  * Some trailing suffix values have special meanings.
- * An unrecognised suffix is an error.
+ * An unrecognized suffix is an error.
  */
 int portal_tcp(pcr, key, v, kso, fdp)
 	struct portal_cred *pcr;
diff --git a/usr.sbin/mount_portalfs/activate.c b/usr.sbin/mount_portalfs/activate.c
index f14a4a3269c3..5bbd3b5a7106 100644
--- a/usr.sbin/mount_portalfs/activate.c
+++ b/usr.sbin/mount_portalfs/activate.c
@@ -35,20 +35,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)activate.c	8.3 (Berkeley) 4/28/95
- *
- * $Id: activate.c,v 1.3 1997/02/22 14:32:53 peter Exp $
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
-#include <signal.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/syslog.h>
 #include <sys/uio.h>
 
diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c
index b7f3e57dbf2d..3b0d965bd03a 100644
--- a/usr.sbin/mount_portalfs/conf.c
+++ b/usr.sbin/mount_portalfs/conf.c
@@ -35,16 +35,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
- *
- * $Id$
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.8 b/usr.sbin/mount_portalfs/mount_portalfs.8
index 5c1f17746dc6..ed9434e557fe 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.8
+++ b/usr.sbin/mount_portalfs/mount_portalfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\"
+.\"	$Id$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
@@ -50,12 +50,12 @@
 .Ar mount_point
 .Sh DESCRIPTION
 The
-.Nm mount_portal
+.Nm
 command attaches an instance of the portal daemon
 to the global filesystem namespace.
 The conventional mount point is
 .Pa /p .
-.PA /dev .
+.\" .PA /dev .
 This command is normally executed by
 .Xr mount 8
 at boot time.
@@ -132,6 +132,6 @@ fs/		file fs/
 This filesystem may not be NFS-exported.
 .Sh HISTORY
 The
-.Nm mount_portal
+.Nm
 utility first appeared in
 .Bx 4.4 .
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index 4f489ed945ad..d3fa3c3a0dce 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -41,24 +41,23 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-/*
+#if 0
 static char sccsid[] = "@(#)mount_portal.c	8.6 (Berkeley) 4/26/95";
-*/
+#endif
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.11 1997/03/24 05:53:12 imp Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <sys/stat.h>
 #include <sys/syslog.h>
 #include <sys/mount.h>
 
 #include <err.h>
 #include <errno.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/mount_portalfs/pt_conf.c b/usr.sbin/mount_portalfs/pt_conf.c
index ae588ad54ef7..2f9ab9772a81 100644
--- a/usr.sbin/mount_portalfs/pt_conf.c
+++ b/usr.sbin/mount_portalfs/pt_conf.c
@@ -35,10 +35,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include "portald.h"
diff --git a/usr.sbin/mount_portalfs/pt_exec.c b/usr.sbin/mount_portalfs/pt_exec.c
index 6ee2bf57a70c..6ee326d50a00 100644
--- a/usr.sbin/mount_portalfs/pt_exec.c
+++ b/usr.sbin/mount_portalfs/pt_exec.c
@@ -35,17 +35,16 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
- *
- * $Id$
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/syslog.h>
 
 #include "portald.h"
 
diff --git a/usr.sbin/mount_portalfs/pt_file.c b/usr.sbin/mount_portalfs/pt_file.c
index 9d71bc72997d..32207f31931e 100644
--- a/usr.sbin/mount_portalfs/pt_file.c
+++ b/usr.sbin/mount_portalfs/pt_file.c
@@ -35,16 +35,17 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_file.c	8.3 (Berkeley) 7/3/94
- *
- * $Id: pt_file.c,v 1.5 1997/02/22 14:32:56 peter Exp $
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index 494911c5657f..d62ca3eb31a7 100644
--- a/usr.sbin/mount_portalfs/pt_tcp.c
+++ b/usr.sbin/mount_portalfs/pt_tcp.c
@@ -35,15 +35,17 @@
  * SUCH DAMAGE.
  *
  *	@(#)pt_tcp.c	8.5 (Berkeley) 4/28/95
- *
- * $Id: pt_tcp.c,v 1.5 1997/03/11 12:35:00 peter Exp $
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <errno.h>
+#include <stdlib.h>
 #include <strings.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
@@ -59,7 +61,7 @@
  * Create a TCP socket connected to the
  * requested host and port.
  * Some trailing suffix values have special meanings.
- * An unrecognised suffix is an error.
+ * An unrecognized suffix is an error.
  */
 int portal_tcp(pcr, key, v, kso, fdp)
 	struct portal_cred *pcr;