diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 6670cb933930..7641f5206f0a 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1994/12/22 10:26:35 cgd Exp $
+#	$NetBSD: Makefile,v 1.7 1996/08/30 20:24:49 thorpej Exp $
 
 PROG=	atrun
 BINDIR=	/usr/libexec
diff --git a/libexec/atrun/atrun.8 b/libexec/atrun/atrun.8
index 30c93e9ae92c..65427eef3306 100644
--- a/libexec/atrun/atrun.8
+++ b/libexec/atrun/atrun.8
@@ -1,3 +1,4 @@
+.\"	$NetBSD: atrun.8,v 1.4 1996/08/30 20:24:50 thorpej Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -27,8 +28,6 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: atrun.8,v 1.3 1994/11/03 15:37:52 jtc Exp $
-.\"
 .Dd December 5, 1993
 .Dt ATRUN 8
 .Os NetBSD 0.9a
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index 664d12e05723..7aa9f1d0ab60 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: atrun.c,v 1.3 1996/08/30 20:24:51 thorpej Exp $	*/
+
 /*
  * atrun.c - run jobs queued by at; run with root privileges.
  * Copyright (c) 1993 by Thomas Koenig
@@ -54,7 +56,7 @@
 /* File scope variables */
 
 static char *namep;
-static char rcsid[] = "$Id: atrun.c,v 1.2 1995/03/02 22:06:06 cgd Exp $";
+static char rcsid[] = "$NetBSD: atrun.c,v 1.3 1996/08/30 20:24:51 thorpej Exp $";
 
 /* Local functions */
 static void
diff --git a/libexec/atrun/atrun.h b/libexec/atrun/atrun.h
index 9dd98097bd75..713f89807d07 100644
--- a/libexec/atrun/atrun.h
+++ b/libexec/atrun/atrun.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: atrun.h,v 1.3 1996/08/30 20:24:53 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
  * All rights reserved.
@@ -26,8 +28,6 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id: atrun.h,v 1.2 1994/01/29 01:49:30 jtc Exp $
  */
 
 #define ATRUN_MAXLOAD	1.5
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 98757cf030e0..f6579e2a3a47 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1995/04/12 00:47:27 jtc Exp $
+#	$NetBSD: Makefile,v 1.4 1996/08/30 20:15:06 thorpej Exp $
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index e270244932f1..39081fa4ebc1 100644
--- a/libexec/rpc.rquotad/rpc.rquotad.8
+++ b/libexec/rpc.rquotad/rpc.rquotad.8
@@ -1,3 +1,4 @@
+.\"	$NetBSD: rpc.rquotad.8,v 1.3 1996/08/30 20:15:07 thorpej Exp $
 .\" 
 .\" Copyright (c) 1994 Theo de Raadt
 .\" All rights reserved.
@@ -27,8 +28,6 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rquotad.8,v 1.2 1995/04/12 00:47:32 jtc Exp $
-.\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
 .Os BSD 4.3
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index 45f176340063..f8c19f81143f 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rquotad.c,v 1.7 1996/08/30 20:15:10 thorpej Exp $	*/
+
 /*
  * by Manuel Bouyer (bouyer@ensta.fr)
  * 
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index 090c993beb9b..7a818ace8c97 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1995/04/12 00:47:43 jtc Exp $
+#	$NetBSD: Makefile,v 1.9 1996/08/30 20:17:40 thorpej Exp $
 
 PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c
diff --git a/libexec/rpc.rstatd/rpc.rstatd.8 b/libexec/rpc.rstatd/rpc.rstatd.8
index ca01a9a66fc8..b3ce436d6b71 100644
--- a/libexec/rpc.rstatd/rpc.rstatd.8
+++ b/libexec/rpc.rstatd/rpc.rstatd.8
@@ -1,4 +1,4 @@
-.\" -*- nroff -*-
+.\"	$NetBSD: rpc.rstatd.8,v 1.7 1996/08/30 20:17:41 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,8 +31,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rstatd.8,v 1.6 1995/04/12 00:47:46 jtc Exp $
-.\"
 .Dd June 7, 1993
 .Dt RPC.RSTATD 8
 .Os BSD 4.3
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index ef860d5eec4c..11862c6fbf0b 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rstat_proc.c,v 1.16 1996/08/30 20:17:42 thorpej Exp $	*/
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -29,7 +31,7 @@
 #ifndef lint
 /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
 /*static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";*/
-static char rcsid[] = "$Id: rstat_proc.c,v 1.15 1996/03/10 15:24:20 ragge Exp $";
+static char rcsid[] = "$NetBSD: rstat_proc.c,v 1.16 1996/08/30 20:17:42 thorpej Exp $";
 #endif
 
 /*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index a1855594d216..2c9c68a54d42 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rstatd.c,v 1.7 1996/08/30 20:17:44 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1993, John Brezak
  * All rights reserved.
@@ -32,7 +34,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rstatd.c,v 1.6 1995/01/13 06:14:31 mycroft Exp $";
+static char rcsid[] = "$NetBSD: rstatd.c,v 1.7 1996/08/30 20:17:44 thorpej Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index 8c7947be6e7a..ea307f19fc7b 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1995/04/12 00:47:50 jtc Exp $
+#	$NetBSD: Makefile,v 1.12 1996/08/30 20:19:41 thorpej Exp $
 
 PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
diff --git a/libexec/rpc.rusersd/rpc.rusersd.8 b/libexec/rpc.rusersd/rpc.rusersd.8
index ca42bdeedea5..be4ecf5767da 100644
--- a/libexec/rpc.rusersd/rpc.rusersd.8
+++ b/libexec/rpc.rusersd/rpc.rusersd.8
@@ -1,4 +1,4 @@
-.\" -*- nroff -*-
+.\"	$NetBSD: rpc.rusersd.8,v 1.5 1996/08/30 20:19:43 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,8 +31,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rusersd.8,v 1.4 1995/04/12 00:47:52 jtc Exp $
-.\"
 .Dd June 7, 1993
 .Dt RPC.RUSERSD 8
 .Os BSD 4.3
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index 372aca3d81b2..0b5fb21af1a7 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rusers_proc.c,v 1.13 1996/08/30 20:19:44 thorpej Exp $	*/
+
 /*-
  *  Copyright (c) 1993 John Brezak
  *  All rights reserved.
@@ -27,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rusers_proc.c,v 1.12 1995/12/14 21:58:33 thorpej Exp $";
+static char rcsid[] = "$NetBSD: rusers_proc.c,v 1.13 1996/08/30 20:19:44 thorpej Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 957810b713a6..ff1fb2808d95 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rusersd.c,v 1.9 1996/08/30 20:19:45 thorpej Exp $	*/
+
 /*-
  *  Copyright (c) 1993 John Brezak
  *  All rights reserved.
@@ -27,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rusersd.c,v 1.8 1995/01/13 19:59:15 mycroft Exp $";
+static char rcsid[] = "$NetBSD: rusersd.c,v 1.9 1996/08/30 20:19:45 thorpej Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index 048b13d0402c..ee357f7f653c 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1995/04/12 00:47:56 jtc Exp $
+#	$NetBSD: Makefile,v 1.8 1996/08/30 20:22:12 thorpej Exp $
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8
index 25e2269e8467..0205dbe6c8a5 100644
--- a/libexec/rpc.rwalld/rpc.rwalld.8
+++ b/libexec/rpc.rwalld/rpc.rwalld.8
@@ -1,4 +1,4 @@
-.\" -*- nroff -*-
+.\"	$NetBSD: rpc.rwalld.8,v 1.5 1996/08/30 20:22:14 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,8 +31,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rwalld.8,v 1.4 1995/04/12 00:47:58 jtc Exp $
-.\"
 .Dd June 7, 1993
 .Dt RPC.RWALLD 8
 .Os BSD 4.3
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index 7bbf64393058..2d27479f1501 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rwalld.c,v 1.10 1996/08/30 20:22:15 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
  * All rights reserved.
@@ -28,7 +30,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: rwalld.c,v 1.9 1995/07/09 00:30:17 pk Exp $";
+static char rcsid[] = "$NetBSD: rwalld.c,v 1.10 1996/08/30 20:22:15 thorpej Exp $";
 #endif /* not lint */
 
 #include <unistd.h>