diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 306ad577f60c..760ac4c8ee07 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -1,5 +1,5 @@
+#	$NetBSD: Makefile,v 1.11 1996/03/18 22:33:07 thorpej Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.10 1996/03/18 21:11:10 leo Exp $
 
 LIB=	kvm
 CFLAGS+=-DLIBC_SCCS
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index 0343d46907f5..f746abe5d276 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm.3,v 1.2 1996/03/18 22:33:11 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 8dd2f37dd112..39203ea34d00 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm.c,v 1.42 1996/03/18 22:33:13 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,7 +38,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
+#else
+static char *rcsid = "$NetBSD: kvm.c,v 1.42 1996/03/18 22:33:13 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libkvm/kvm_arm32.c b/lib/libkvm/kvm_arm32.c
index 8a8b7ff37ffd..ce4aebe7c5f1 100644
--- a/lib/libkvm/kvm_arm32.c
+++ b/lib/libkvm/kvm_arm32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_arm32.c,v 1.1 1996/02/02 15:35:41 mark Exp $ */
+/*	$NetBSD: kvm_arm32.c,v 1.2 1996/03/18 22:33:16 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1989, 1992, 1993
@@ -35,13 +35,14 @@
  * 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: kvm_arm32.c,v 1.1 1996/02/02 15:35:41 mark Exp $
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: kvm_arm32.c,v 1.1 1996/02/02 15:35:41 mark Exp $";
+#if 0
+static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_arm32.c,v 1.2 1996/03/18 22:33:16 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c
index bd6737430f80..a2764b98c2a0 100644
--- a/lib/libkvm/kvm_file.c
+++ b/lib/libkvm/kvm_file.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_file.c,v 1.5 1996/03/18 22:33:18 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +34,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)kvm_file.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_file.c,v 1.5 1996/03/18 22:33:18 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libkvm/kvm_geterr.3 b/lib/libkvm/kvm_geterr.3
index b8eefa7aa748..8daf97577355 100644
--- a/lib/libkvm/kvm_geterr.3
+++ b/lib/libkvm/kvm_geterr.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm_geterr.3,v 1.2 1996/03/18 22:33:20 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index 3c3ba6b28484..f32657ac4e26 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm_getfiles.3,v 1.3 1996/03/18 22:33:23 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3
index 80dc3b1d4c2b..c41101831b01 100644
--- a/lib/libkvm/kvm_getloadavg.3
+++ b/lib/libkvm/kvm_getloadavg.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm_getloadavg.3,v 1.2 1996/03/18 22:33:26 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm_getloadavg.c b/lib/libkvm/kvm_getloadavg.c
index e13ee1d46e8b..1f63bea3ea46 100644
--- a/lib/libkvm/kvm_getloadavg.c
+++ b/lib/libkvm/kvm_getloadavg.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_getloadavg.c,v 1.2 1996/03/18 22:33:31 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +34,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)kvm_getloadavg.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_getloadavg.c,v 1.2 1996/03/18 22:33:31 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index a5eacb9a34aa..c845ea985001 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm_getprocs.3,v 1.2 1996/03/18 22:33:35 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index a4e70031a9e9..b1fcdfcb5749 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_i386.c,v 1.9 1996/03/18 22:33:38 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,8 +38,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: kvm_i386.c,v 1.8 1996/03/08 10:45:16 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_i386.c,v 1.9 1996/03/18 22:33:38 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libkvm/kvm_m68k.c b/lib/libkvm/kvm_m68k.c
index 9b9dcab8f938..64b311b186ae 100644
--- a/lib/libkvm/kvm_m68k.c
+++ b/lib/libkvm/kvm_m68k.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_m68k.c,v 1.7 1996/03/18 22:33:41 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,8 +38,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-/* from: static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: kvm_m68k.c,v 1.6 1996/03/16 10:23:51 leo Exp $";
+#if 0
+static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_m68k.c,v 1.7 1996/03/18 22:33:41 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libkvm/kvm_mips.c b/lib/libkvm/kvm_mips.c
index db768bf5a60f..48a3e18d1ddd 100644
--- a/lib/libkvm/kvm_mips.c
+++ b/lib/libkvm/kvm_mips.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_mips.c,v 1.3 1996/03/18 22:33:44 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,8 +38,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)kvm_mips.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_mips.c,v 1.3 1996/03/18 22:33:44 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
+
 /*
  * MIPS machine dependent routines for kvm.  Hopefully, the forthcoming 
  * vm code will one day obsolete this module.
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index f3b2fdc6fdff..18de5d1f44cf 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm_nlist.3,v 1.3 1996/03/18 22:33:48 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm_ns32k.c b/lib/libkvm/kvm_ns32k.c
index eb312fd18c6e..3d757918b406 100644
--- a/lib/libkvm/kvm_ns32k.c
+++ b/lib/libkvm/kvm_ns32k.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_ns32k.c,v 1.3 1996/02/01 07:24:37 phil Exp $	*/
+/*	$NetBSD: kvm_ns32k.c,v 1.4 1996/03/18 22:33:50 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1992, 1993
@@ -37,12 +37,17 @@
  * SUCH DAMAGE.
  */
 
-/* from: "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93"; */
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_ns32k.c,v 1.4 1996/03/18 22:33:50 thorpej Exp $";
+#endif
+#endif /* LIBC_SCCS and not lint */
 
 /*
  * ns32k machine dependent routines for kvm.  Hopefully, the forthcoming 
  * vm code will one day obsolete this module.
- *
  */
 
 #include <sys/param.h>
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index dd6895b417d4..e8f17d2ca560 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm_open.3,v 1.2 1996/03/18 22:33:52 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index c42cfe9d7061..c1b358abfee5 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_private.h,v 1.6 1996/03/18 22:33:54 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 2e92a482980c..5aa759930f0c 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_proc.c,v 1.16 1996/03/18 22:33:57 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
  * Copyright (c) 1989, 1992, 1993
@@ -37,7 +39,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
+#else
+static char *rcsid = "$NetBSD: kvm_proc.c,v 1.16 1996/03/18 22:33:57 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
index b5609599f6ab..f89febb8cb60 100644
--- a/lib/libkvm/kvm_read.3
+++ b/lib/libkvm/kvm_read.3
@@ -1,3 +1,5 @@
+.\"	$NetBSD: kvm_read.3,v 1.2 1996/03/18 22:34:01 thorpej Exp $
+.\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c
index c89759e04f45..f10bdcd8cb99 100644
--- a/lib/libkvm/kvm_sparc.c
+++ b/lib/libkvm/kvm_sparc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_sparc.c,v 1.8 1996/03/18 22:34:02 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,7 +38,11 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
+#else
+static char *rcsid = "$NetBSD: kvm_sparc.c,v 1.8 1996/03/18 22:34:02 thorpej Exp $";
+#endif
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/lib/libkvm/kvm_sun3.c b/lib/libkvm/kvm_sun3.c
index f4cbac772da8..a937b7dc3177 100644
--- a/lib/libkvm/kvm_sun3.c
+++ b/lib/libkvm/kvm_sun3.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: kvm_sun3.c,v 1.3 1996/03/18 22:34:04 thorpej Exp $	*/
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/lib/libkvm/kvm_vax.c b/lib/libkvm/kvm_vax.c
index b4a2b9532f60..e385ffab9a9b 100644
--- a/lib/libkvm/kvm_vax.c
+++ b/lib/libkvm/kvm_vax.c
@@ -1,4 +1,5 @@
-/*	$NetBSD: kvm_vax.c,v 1.2 1995/04/25 15:41:11 ragge Exp $ */
+/*	$NetBSD: kvm_vax.c,v 1.3 1996/03/18 22:34:06 thorpej Exp $ */
+
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.