diff --git a/Makefile b/Makefile
index d10bf1b..737b90f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/03/16 22:23:34 cjs Exp $
+#	$NetBSD: Makefile,v 1.2 1997/03/25 03:06:58 thorpej Exp $
 
 SUBDIR=	mopd mopprobe moptrace mopchk mopa.out
 
diff --git a/Makefile.inc b/Makefile.inc
index 205e50d..c1aa59f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1,4 +1,3 @@
-#	from: @(#)Makefile.inc	5.1 (Berkeley) 5/11/90
-#	$Id: Makefile.inc,v 1.1.1.1 1997/03/16 22:23:35 cjs Exp $
+#	$NetBSD: Makefile.inc,v 1.2 1997/03/25 03:07:00 thorpej Exp $
 
 BINDIR?=	/usr/sbin
diff --git a/common/cmp.c b/common/cmp.c
index 43df691..20f9b03 100644
--- a/common/cmp.c
+++ b/common/cmp.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: cmp.c,v 1.2 1997/03/25 03:07:02 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: cmp.c,v 1.1.1.1 1997/03/16 22:23:35 cjs Exp $";
+static char rcsid[] = "$NetBSD: cmp.c,v 1.2 1997/03/25 03:07:02 thorpej Exp $";
 #endif
 
 #include "os.h"
diff --git a/common/cmp.h b/common/cmp.h
index 3044241..bebcd2a 100644
--- a/common/cmp.h
+++ b/common/cmp.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: cmp.h,v 1.2 1997/03/25 03:07:04 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: cmp.h,v 1.1.1.1 1997/03/16 22:23:35 cjs Exp $
+ *	$NetBSD: cmp.h,v 1.2 1997/03/25 03:07:04 thorpej Exp $
  *
  */
 
diff --git a/common/common.h b/common/common.h
index 1f13845..4ad52d8 100644
--- a/common/common.h
+++ b/common/common.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: common.h,v 1.2 1997/03/25 03:07:05 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: common.h,v 1.1.1.1 1997/03/16 22:23:35 cjs Exp $
+ *	$NetBSD: common.h,v 1.2 1997/03/25 03:07:05 thorpej Exp $
  *
  */
 
diff --git a/common/device.c b/common/device.c
index d2362c5..6db4994 100644
--- a/common/device.c
+++ b/common/device.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: device.c,v 1.2 1997/03/25 03:07:06 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: device.c,v 1.1.1.1 1997/03/16 22:23:35 cjs Exp $";
+static char rcsid[] = "$NetBSD: device.c,v 1.2 1997/03/25 03:07:06 thorpej Exp $";
 #endif
 
 #include "os.h"
diff --git a/common/device.h b/common/device.h
index 94bb32f..80dc52a 100644
--- a/common/device.h
+++ b/common/device.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: device.h,v 1.2 1997/03/25 03:07:07 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: device.h,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $
+ *	$NetBSD: device.h,v 1.2 1997/03/25 03:07:07 thorpej Exp $
  *
  */
 
diff --git a/common/dl.c b/common/dl.c
index aea23aa..4b489cd 100644
--- a/common/dl.c
+++ b/common/dl.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: dl.c,v 1.2 1997/03/25 03:07:09 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: dl.c,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $";
+static char rcsid[] = "$NetBSD: dl.c,v 1.2 1997/03/25 03:07:09 thorpej Exp $";
 #endif
 
 #include "os.h"
diff --git a/common/dl.h b/common/dl.h
index 2007eab..7434478 100644
--- a/common/dl.h
+++ b/common/dl.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: dl.h,v 1.2 1997/03/25 03:07:10 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: dl.h,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $
+ *	$NetBSD: dl.h,v 1.2 1997/03/25 03:07:10 thorpej Exp $
  *
  */
 
diff --git a/common/file.c b/common/file.c
index b1ad332..3ff0944 100644
--- a/common/file.c
+++ b/common/file.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: file.c,v 1.2 1997/03/25 03:07:12 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: file.c,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $";
+static char rcsid[] = "$NetBSD: file.c,v 1.2 1997/03/25 03:07:12 thorpej Exp $";
 #endif
 
 #include "os.h"
diff --git a/common/file.h b/common/file.h
index d901f52..2e684be 100644
--- a/common/file.h
+++ b/common/file.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: file.h,v 1.2 1997/03/25 03:07:13 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: file.h,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $
+ *	$NetBSD: file.h,v 1.2 1997/03/25 03:07:13 thorpej Exp $
  *
  */
 
diff --git a/common/get.c b/common/get.c
index 6073644..2536e44 100644
--- a/common/get.c
+++ b/common/get.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: get.c,v 1.2 1997/03/25 03:07:15 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: get.c,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $";
+static char rcsid[] = "$NetBSD: get.c,v 1.2 1997/03/25 03:07:15 thorpej Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/common/get.h b/common/get.h
index 764eb0e..eb6f187 100644
--- a/common/get.h
+++ b/common/get.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: get.h,v 1.2 1997/03/25 03:07:16 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: get.h,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $
+ *	$NetBSD: get.h,v 1.2 1997/03/25 03:07:16 thorpej Exp $
  *
  */
 
diff --git a/common/loop-bsd.c b/common/loop-bsd.c
index 24b23fb..05e517d 100644
--- a/common/loop-bsd.c
+++ b/common/loop-bsd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: loop-bsd.c,v 1.2 1997/03/25 03:07:17 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: loop-bsd.c,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $";
+static char rcsid[] = "$NetBSD: loop-bsd.c,v 1.2 1997/03/25 03:07:17 thorpej Exp $";
 #endif
 
 #include <stdlib.h>
diff --git a/common/mopdef.c b/common/mopdef.c
index 1b63f7b..f96530e 100644
--- a/common/mopdef.c
+++ b/common/mopdef.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mopdef.c,v 1.2 1997/03/25 03:07:19 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: mopdef.c,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $";
+static char rcsid[] = "$NetBSD: mopdef.c,v 1.2 1997/03/25 03:07:19 thorpej Exp $";
 #endif
 
 #define MOPDEF_SURPESS_EXTERN
diff --git a/common/mopdef.h b/common/mopdef.h
index 1b01156..5f50a3c 100644
--- a/common/mopdef.h
+++ b/common/mopdef.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: mopdef.h,v 1.2 1997/03/25 03:07:20 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: mopdef.h,v 1.1.1.1 1997/03/16 22:23:36 cjs Exp $
+ *	$NetBSD: mopdef.h,v 1.2 1997/03/25 03:07:20 thorpej Exp $
  *
  */
 
diff --git a/common/nma.c b/common/nma.c
index 1c535a8..efe89ac 100644
--- a/common/nma.c
+++ b/common/nma.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: nma.c,v 1.2 1997/03/25 03:07:22 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: nma.c,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $";
+static char rcsid[] = "$NetBSD: nma.c,v 1.2 1997/03/25 03:07:22 thorpej Exp $";
 #endif
 
 #include <stddef.h>
diff --git a/common/nma.h b/common/nma.h
index 9d2dea5..9989b5e 100644
--- a/common/nma.h
+++ b/common/nma.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: nma.h,v 1.2 1997/03/25 03:07:23 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: nma.h,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+ *	$NetBSD: nma.h,v 1.2 1997/03/25 03:07:23 thorpej Exp $
  *
  */
 
diff --git a/common/nmadef.h b/common/nmadef.h
index 12c847b..c09c734 100644
--- a/common/nmadef.h
+++ b/common/nmadef.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: nmadef.h,v 1.2 1997/03/25 03:07:25 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: nmadef.h,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+ *	$NetBSD: nmadef.h,v 1.2 1997/03/25 03:07:25 thorpej Exp $
  *
  */
 
diff --git a/common/os.h b/common/os.h
index a83f66d..64f040b 100644
--- a/common/os.h
+++ b/common/os.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: os.h,v 1.2 1997/03/25 03:07:26 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1994-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: os.h,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+ *	$NetBSD: os.h,v 1.2 1997/03/25 03:07:26 thorpej Exp $
  *
  */
 
diff --git a/common/pf.c b/common/pf.c
index e8158a8..e2c1964 100644
--- a/common/pf.c
+++ b/common/pf.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: pf.c,v 1.3 1997/03/25 03:07:27 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  * Copyright (c) 1990 The Regents of the University of California.
@@ -32,7 +34,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: pf.c,v 1.2 1997/03/17 10:39:53 veego Exp $";
+static char rcsid[] = "$NetBSD: pf.c,v 1.3 1997/03/25 03:07:27 thorpej Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/common/pf.h b/common/pf.h
index a29a7fa..4a83ead 100644
--- a/common/pf.h
+++ b/common/pf.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: pf.h,v 1.2 1997/03/25 03:07:29 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: pf.h,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+ *	$NetBSD: pf.h,v 1.2 1997/03/25 03:07:29 thorpej Exp $
  *
  */
 
diff --git a/common/print.c b/common/print.c
index e0b5ccc..e55044b 100644
--- a/common/print.c
+++ b/common/print.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: print.c,v 1.2 1997/03/25 03:07:30 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: print.c,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $";
+static char rcsid[] = "$NetBSD: print.c,v 1.2 1997/03/25 03:07:30 thorpej Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/common/print.h b/common/print.h
index 7c15358..60493e9 100644
--- a/common/print.h
+++ b/common/print.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: print.h,v 1.2 1997/03/25 03:07:31 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: print.h,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+ *	$NetBSD: print.h,v 1.2 1997/03/25 03:07:31 thorpej Exp $
  *
  */
 
diff --git a/common/put.c b/common/put.c
index 4c80321..9b7fd99 100644
--- a/common/put.c
+++ b/common/put.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: put.c,v 1.2 1997/03/25 03:07:33 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: put.c,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $";
+static char rcsid[] = "$NetBSD: put.c,v 1.2 1997/03/25 03:07:33 thorpej Exp $";
 #endif
 
 #include <stddef.h>
diff --git a/common/put.h b/common/put.h
index 1ceaa4b..e24d7b5 100644
--- a/common/put.h
+++ b/common/put.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: put.h,v 1.2 1997/03/25 03:07:34 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: put.h,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+ *	$NetBSD: put.h,v 1.2 1997/03/25 03:07:34 thorpej Exp $
  *
  */
 
diff --git a/common/rc.c b/common/rc.c
index 3f893d9..922221b 100644
--- a/common/rc.c
+++ b/common/rc.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: rc.c,v 1.2 1997/03/25 03:07:35 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: rc.c,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $";
+static char rcsid[] = "$NetBSD: rc.c,v 1.2 1997/03/25 03:07:35 thorpej Exp $";
 #endif
 
 #include "os.h"
diff --git a/common/rc.h b/common/rc.h
index 6afcb99..0f982bf 100644
--- a/common/rc.h
+++ b/common/rc.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: rc.h,v 1.2 1997/03/25 03:07:36 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: rc.h,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+ *	$NetBSD: rc.h,v 1.2 1997/03/25 03:07:36 thorpej Exp $
  *
  */
 
diff --git a/mopa.out/Makefile b/mopa.out/Makefile
index d240c43..b1ec98d 100644
--- a/mopa.out/Makefile
+++ b/mopa.out/Makefile
@@ -1,5 +1,4 @@
-
-#	$Id: Makefile,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
+#	$NetBSD: Makefile,v 1.2 1997/03/25 03:07:38 thorpej Exp $
 
 PROG=	mopa.out
 SRCS=	mopa.out.c file.c
diff --git a/mopa.out/mopa.out.1 b/mopa.out/mopa.out.1
index 5eaba45..ef05992 100644
--- a/mopa.out/mopa.out.1
+++ b/mopa.out/mopa.out.1
@@ -1,3 +1,4 @@
+.\"	$NetBSD: mopa.out.1,v 1.2 1997/03/25 03:07:39 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -26,8 +27,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: mopa.out.1,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $
-.\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
 .Sh NAME
diff --git a/mopa.out/mopa.out.c b/mopa.out/mopa.out.c
index 3a84a34..4c6225c 100644
--- a/mopa.out/mopa.out.c
+++ b/mopa.out/mopa.out.c
@@ -1,3 +1,4 @@
+/*	$NetBSD: mopa.out.c,v 1.2 1997/03/25 03:07:41 thorpej Exp $	*/
 
 /* mopa.out - Convert a Unix format kernel into something that
  * can be transfered via MOP.
@@ -47,7 +48,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: mopa.out.c,v 1.1.1.1 1997/03/16 22:23:37 cjs Exp $";
+static char rcsid[] = "$NetBSD: mopa.out.c,v 1.2 1997/03/25 03:07:41 thorpej Exp $";
 #endif
 
 #include "os.h"
diff --git a/mopchk/Makefile b/mopchk/Makefile
index 2cfd0e9..0c4daf4 100644
--- a/mopchk/Makefile
+++ b/mopchk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/03/24 22:02:43 christos Exp $
+#	$NetBSD: Makefile,v 1.3 1997/03/25 03:07:42 thorpej Exp $
 
 PROG=	mopchk
 SRCS=	mopchk.c device.c version.c pf.c loop-bsd.c file.c
diff --git a/mopchk/mopchk.1 b/mopchk/mopchk.1
index 9850148..6232342 100644
--- a/mopchk/mopchk.1
+++ b/mopchk/mopchk.1
@@ -1,3 +1,4 @@
+.\"	$NetBSD: mopchk.1,v 1.2 1997/03/25 03:07:43 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -26,8 +27,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: mopchk.1,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $
-.\"
 .Dd October 2, 1995
 .Dt MOPCHK 1
 .Sh NAME
diff --git a/mopchk/mopchk.c b/mopchk/mopchk.c
index 128d042..9a17675 100644
--- a/mopchk/mopchk.c
+++ b/mopchk/mopchk.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mopchk.c,v 1.2 1997/03/25 03:07:45 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: mopchk.c,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $";
+static char rcsid[] = "$NetBSD: mopchk.c,v 1.2 1997/03/25 03:07:45 thorpej Exp $";
 #endif
 
 /*
diff --git a/mopd/Makefile b/mopd/Makefile
index a85f315..cb98e20 100644
--- a/mopd/Makefile
+++ b/mopd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/03/24 22:02:44 christos Exp $
+#	$NetBSD: Makefile,v 1.3 1997/03/25 03:07:46 thorpej Exp $
 
 PROG=	mopd
 SRCS=	mopd.c process.c print.c cmp.c get.c put.c mopdef.c nma.c device.c \
diff --git a/mopd/mopd.8 b/mopd/mopd.8
index 120aea9..8f94d95 100644
--- a/mopd/mopd.8
+++ b/mopd/mopd.8
@@ -1,3 +1,4 @@
+.\"	$NetBSD: mopd.8,v 1.2 1997/03/25 03:07:48 thorpej Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -26,8 +27,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: mopd.8,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $
-.\"
 .Dd September 24, 1995
 .Dt MOPD 8
 .Sh NAME
diff --git a/mopd/mopd.c b/mopd/mopd.c
index cd256e0..11a6ae6 100644
--- a/mopd/mopd.c
+++ b/mopd/mopd.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mopd.c,v 1.2 1997/03/25 03:07:49 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: mopd.c,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $";
+static char rcsid[] = "$NetBSD: mopd.c,v 1.2 1997/03/25 03:07:49 thorpej Exp $";
 #endif
 
 /*
diff --git a/mopd/process.c b/mopd/process.c
index e38a834..0e5f7e2 100644
--- a/mopd/process.c
+++ b/mopd/process.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: process.c,v 1.2 1997/03/25 03:07:51 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: process.c,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $";
+static char rcsid[] = "$NetBSD: process.c,v 1.2 1997/03/25 03:07:51 thorpej Exp $";
 #endif
 
 #include "os.h"
diff --git a/mopd/process.h b/mopd/process.h
index 0601c2b..2dc62de 100644
--- a/mopd/process.h
+++ b/mopd/process.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: process.h,v 1.2 1997/03/25 03:07:52 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -26,7 +28,7 @@
  * (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: process.h,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $
+ *	$NetBSD: process.h,v 1.2 1997/03/25 03:07:52 thorpej Exp $
  *
  */
 
diff --git a/mopprobe/Makefile b/mopprobe/Makefile
index 81272ee..b9530e6 100644
--- a/mopprobe/Makefile
+++ b/mopprobe/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/03/24 22:02:46 christos Exp $
+#	$NetBSD: Makefile,v 1.3 1997/03/25 03:07:55 thorpej Exp $
 
 PROG=	mopprobe
 SRCS=	mopprobe.c device.c get.c cmp.c mopdef.c version.c pf.c loop-bsd.c
diff --git a/mopprobe/mopprobe.1 b/mopprobe/mopprobe.1
index d2144aa..59944ef 100644
--- a/mopprobe/mopprobe.1
+++ b/mopprobe/mopprobe.1
@@ -1,3 +1,4 @@
+.\"	$NetBSD: mopprobe.1,v 1.2 1997/03/25 03:07:56 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -26,8 +27,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: mopprobe.1,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $
-.\"
 .Dd October 2, 1995
 .Dt MOPPROBE 1
 .Sh NAME
diff --git a/mopprobe/mopprobe.c b/mopprobe/mopprobe.c
index beba537..76e7951 100644
--- a/mopprobe/mopprobe.c
+++ b/mopprobe/mopprobe.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: mopprobe.c,v 1.2 1997/03/25 03:07:57 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: mopprobe.c,v 1.1.1.1 1997/03/16 22:23:38 cjs Exp $";
+static char rcsid[] = "$NetBSD: mopprobe.c,v 1.2 1997/03/25 03:07:57 thorpej Exp $";
 #endif
 
 /*
diff --git a/moptrace/Makefile b/moptrace/Makefile
index f4efa4b..0745820 100644
--- a/moptrace/Makefile
+++ b/moptrace/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/03/24 22:02:47 christos Exp $
+#	$NetBSD: Makefile,v 1.3 1997/03/25 03:07:59 thorpej Exp $
 
 PROG=	moptrace
 SRCS=	moptrace.c print.c cmp.c get.c mopdef.c nma.c device.c version.c pf.c \
diff --git a/moptrace/moptrace.1 b/moptrace/moptrace.1
index 010f528..438793b 100644
--- a/moptrace/moptrace.1
+++ b/moptrace/moptrace.1
@@ -1,3 +1,4 @@
+.\"	$NetBSD: moptrace.1,v 1.2 1997/03/25 03:08:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" (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: moptrace.1,v 1.1.1.1 1997/03/16 22:23:39 cjs Exp $
+.\" @(#) $Id: moptrace.1,v 1.2 1997/03/25 03:08:00 thorpej Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPTRACE 1
diff --git a/moptrace/moptrace.c b/moptrace/moptrace.c
index 00b5a04..a73ee84 100644
--- a/moptrace/moptrace.c
+++ b/moptrace/moptrace.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: moptrace.c,v 1.2 1997/03/25 03:08:02 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
  *
@@ -28,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: moptrace.c,v 1.1.1.1 1997/03/16 22:23:39 cjs Exp $";
+static char rcsid[] = "$NetBSD: moptrace.c,v 1.2 1997/03/25 03:08:02 thorpej Exp $";
 #endif
 
 /*