diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index a201e6252a6f..0b74ac85d1c9 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,5 @@
+#	$NetBSD: Makefile,v 1.8 1996/07/31 20:40:24 thorpej Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.7 1994/12/22 10:27:06 cgd Exp $
 
 PROG=	getty
 SRCS=	main.c init.c subr.c
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 5402c4a3f151..787bd30fa15f 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: extern.h,v 1.4 1996/07/31 20:40:26 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/4/93
- *	$Id: extern.h,v 1.3 1996/05/15 23:46:50 jtc Exp $
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 1b00ae5a05ed..22d91c098fe6 100644
--- a/libexec/getty/getty.8
+++ b/libexec/getty/getty.8
@@ -1,3 +1,5 @@
+.\"	$NetBSD: getty.8,v 1.4 1996/07/31 20:40:27 thorpej Exp $
+.\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -30,7 +32,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)getty.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: getty.8,v 1.3 1994/08/17 20:10:30 pk Exp $
 .\"
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 2c2589911dcc..88eddb5e8a86 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -1,3 +1,5 @@
+.\"	$NetBSD: gettytab.5,v 1.13 1996/07/31 20:40:29 thorpej Exp $
+.\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -30,7 +32,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\"	$Id: gettytab.5,v 1.12 1994/09/24 00:56:05 mycroft Exp $
 .\"
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index a712e43909bd..9a189434832f 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: gettytab.h,v 1.8 1996/07/31 20:40:31 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)gettytab.h	8.2 (Berkeley) 3/30/94
- *	$Id: gettytab.h,v 1.7 1994/08/17 20:10:34 pk Exp $
  */
 
 /*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index f3e78c00e1f6..4f98482faa14 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: init.c,v 1.7 1996/07/31 20:40:32 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)init.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: init.c,v 1.6 1994/08/17 20:10:35 pk Exp $";
+#if 0
+static char sccsid[] = "from: @(#)init.c	8.1 (Berkeley) 6/4/93";
+#else
+static char rcsid[] = "$NetBSD: init.c,v 1.7 1996/07/31 20:40:32 thorpej Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 83c554ac2664..d60e59785e3c 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: main.c,v 1.18 1996/07/31 20:40:34 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1980, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,8 +40,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)main.c	8.1 (Berkeley) 6/20/93";*/
-static char rcsid[] = "$Id: main.c,v 1.17 1996/05/15 23:46:52 jtc Exp $";
+#if 0
+static char sccsid[] = "from: @(#)main.c	8.1 (Berkeley) 6/20/93";
+#else
+static char rcsid[] = "$NetBSD: main.c,v 1.18 1996/07/31 20:40:34 thorpej Exp $";
+#endif
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 5cfe73dfa6fd..206eef44cf84 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pathnames.h,v 1.4 1996/07/31 20:40:35 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -31,7 +33,6 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	8.1 (Berkeley) 6/4/93
- *	$Id: pathnames.h,v 1.3 1994/08/17 20:10:39 pk Exp $
  */
 
 #include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index 8c55e37dc4f7..68b00827fd1c 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: subr.c,v 1.19 1996/07/31 20:40:36 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)subr.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$Id: subr.c,v 1.18 1995/10/05 08:51:31 mycroft Exp $";
+#if 0
+static char sccsid[] = "from: @(#)subr.c	8.1 (Berkeley) 6/4/93";
+#else
+static char rcsid[] = "$NetBSD: subr.c,v 1.19 1996/07/31 20:40:36 thorpej Exp $";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 59287821c827..29e344f3f9ac 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -1,3 +1,5 @@
+.\"	$NetBSD: ttys.5,v 1.7 1996/07/31 20:40:40 thorpej Exp $
+.\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -30,7 +32,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ttys.5	8.1 (Berkeley) 6/4/93
-.\"	$Id: ttys.5,v 1.6 1994/08/17 20:10:41 pk Exp $
 .\"
 .Dd June 4, 1993
 .Dt TTYS 5
diff --git a/share/man/man4/man4.sparc/Makefile b/share/man/man4/man4.sparc/Makefile
index 8c0d0dcdedc8..35cbd3cce0fa 100644
--- a/share/man/man4/man4.sparc/Makefile
+++ b/share/man/man4/man4.sparc/Makefile
@@ -1,5 +1,5 @@
+#	$NetBSD: Makefile,v 1.7 1996/07/31 20:33:02 thorpej Exp $
 # 	from: @(#)Makefile	8.2 (Berkeley) 2/16/94
-#	$Id: Makefile,v 1.6 1996/06/22 21:35:14 pk Exp $
 
 MAN=	bwtwo.4 cgeight.4 cgfour.4 cgsix.4 cgthree.4 cgtwo.4 \
 	fd.4 kbd.4 le.4 mem.4 ms.4 openprom.4 tcx.4
diff --git a/share/man/man4/man4.sparc/bwtwo.4 b/share/man/man4/man4.sparc/bwtwo.4
index 4d5c9c94b034..1fc00b904fca 100644
--- a/share/man/man4/man4.sparc/bwtwo.4
+++ b/share/man/man4/man4.sparc/bwtwo.4
@@ -1,3 +1,5 @@
+.\"	$NetBSD: bwtwo.4,v 1.2 1996/07/31 20:33:03 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -35,7 +37,6 @@
 .\"
 .\"	from: Header: bwtwo.4,v 1.3 94/02/03 20:42:13 leres Exp
 .\"     from: @(#)bwtwo.4	8.2 (Berkeley) 2/16/94
-.\"	$Id: bwtwo.4,v 1.1 1994/07/01 20:47:37 deraadt Exp $
 .\"
 .Dd February 16, 1994
 .Dt BWTWO 4 sparc
diff --git a/share/man/man4/man4.sparc/cgsix.4 b/share/man/man4/man4.sparc/cgsix.4
index d41b6c75a736..5686f3889ef0 100644
--- a/share/man/man4/man4.sparc/cgsix.4
+++ b/share/man/man4/man4.sparc/cgsix.4
@@ -1,3 +1,5 @@
+.\"	$NetBSD: cgsix.4,v 1.3 1996/07/31 20:33:04 thorpej Exp $
+.\"
 .\" Copyright 1994
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -34,7 +36,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)cgsix.4	8.1 (Berkeley) 2/16/94
-.\"	$Id: cgsix.4,v 1.2 1996/06/21 22:23:00 pk Exp $
 .\"
 .Dd February 16, 1994
 .Dt CGSIX 4 sparc
diff --git a/share/man/man4/man4.sparc/cgthree.4 b/share/man/man4/man4.sparc/cgthree.4
index 3984dff67713..e6bbe5720b6c 100644
--- a/share/man/man4/man4.sparc/cgthree.4
+++ b/share/man/man4/man4.sparc/cgthree.4
@@ -1,3 +1,5 @@
+.\"	$NetBSD: cgthree.4,v 1.3 1996/07/31 20:33:05 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -35,7 +37,6 @@
 .\"
 .\"	from: Header: cgthree.4,v 1.3 94/02/03 20:49:52 leres Exp
 .\"     from: @(#)cgthree.4	8.2 (Berkeley) 2/16/94
-.\"	$Id: cgthree.4,v 1.2 1996/06/21 22:23:05 pk Exp $
 .\"
 .Dd February 16, 1994
 .Dt CGTHREE 4 sparc
diff --git a/share/man/man4/man4.sparc/le.4 b/share/man/man4/man4.sparc/le.4
index e768a2519e51..8372e93e004e 100644
--- a/share/man/man4/man4.sparc/le.4
+++ b/share/man/man4/man4.sparc/le.4
@@ -1,3 +1,5 @@
+.\"	$NetBSD: le.4,v 1.4 1996/07/31 20:33:06 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -35,7 +37,6 @@
 .\"
 .\"	from: Header: le.4,v 1.2 92/10/13 05:31:33 leres Exp
 .\"	from: @(#)le.4	8.1 (Berkeley) 6/9/93
-.\"	$Id: le.4,v 1.3 1996/07/06 00:08:41 abrown Exp $
 .\"
 .Dd June 9, 1993
 .Dt LE 4 sparc
diff --git a/share/man/man4/man4.sparc/mem.4 b/share/man/man4/man4.sparc/mem.4
index 8a8677fe2970..3f70bb3934da 100644
--- a/share/man/man4/man4.sparc/mem.4
+++ b/share/man/man4/man4.sparc/mem.4
@@ -1,3 +1,5 @@
+.\"	$NetBSD: mem.4,v 1.2 1996/07/31 20:33:08 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -34,7 +36,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)mem.4	8.1 (Berkeley) 6/5/93
-.\"	$Id: mem.4,v 1.1 1994/07/01 20:47:53 deraadt Exp $
 .\"
 .Dd June 5, 1993
 .Dt MEM 4 sparc
diff --git a/share/man/man4/man4.sparc/openprom.4 b/share/man/man4/man4.sparc/openprom.4
index ceb7542a9b22..6de96b29c97b 100644
--- a/share/man/man4/man4.sparc/openprom.4
+++ b/share/man/man4/man4.sparc/openprom.4
@@ -1,3 +1,5 @@
+.\"	$NetBSD: openprom.4,v 1.2 1996/07/31 20:33:09 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -34,7 +36,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)openprom.4	8.1 (Berkeley) 6/5/93
-.\"	$Id: openprom.4,v 1.1 1994/07/01 20:47:56 deraadt Exp $
 .\"
 .Dd June 5, 1993
 .Dt OPENPROM 4 sparc