diff --git a/Makefile b/Makefile
index 6c56b90..bd4f893 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.5 2001/01/09 03:13:43 lukem Exp $
+#	$NetBSD: Makefile,v 1.6 2002/06/06 23:00:56 thorpej Exp $
 
-SUBDIR=	common .WAIT mopa.out mopchk mopd mopprobe moptrace
+SUBDIR=	common .WAIT mopcopy mopchk mopd mopprobe moptrace
 
 .include <bsd.subdir.mk>
diff --git a/mopa.out/Makefile b/mopa.out/Makefile
deleted file mode 100644
index ed7d304..0000000
--- a/mopa.out/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile,v 1.5 1997/10/16 07:36:37 lukem Exp $
-
-PROG=	mopa.out
-
-.include <bsd.prog.mk>
diff --git a/mopcopy/Makefile b/mopcopy/Makefile
new file mode 100644
index 0000000..fd5b4a5
--- /dev/null
+++ b/mopcopy/Makefile
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2002/06/06 23:01:00 thorpej Exp $
+
+PROG=	mopcopy
+
+.include <bsd.prog.mk>
diff --git a/mopa.out/mopa.out.1 b/mopcopy/mopcopy.1
similarity index 82%
rename from mopa.out/mopa.out.1
rename to mopcopy/mopcopy.1
index 357d95e..acfdf45 100644
--- a/mopa.out/mopa.out.1
+++ b/mopcopy/mopcopy.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mopa.out.1,v 1.4 2002/01/19 03:36:20 wiz Exp $
+.\"	$NetBSD: mopcopy.1,v 1.1 2002/06/06 23:01:01 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,24 +27,20 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 11, 1996
-.Dt MOPA.OUT 1
+.Dd June 6, 2002
+.Dt MOPCOPY 1
 .Sh NAME
-.Nm mopa.out
-.Nd Create MOP image from a a.out file
+.Nm mopcopy
+.Nd Create MOP image from another executable format
 .Sh SYNOPSIS
 .Nm
 .Ar infile
 .Ar outfile
 .Sh DESCRIPTION
 .Nm
-is used to convert an a.out file to a MOP-image.
+is used to convert a file from another executable format to a MOP image.
 .Pp
-This program will check if
-.Xr a.out 5
-machine-id is recognized. If not it will try to swap the
-.Xr a.out 5
-header, and try again.
+Elf32 and a.out VAX images are currently supported.
 .Sh SEE ALSO
 .Xr mopchk 1 ,
 .Xr mopprobe 1 ,
@@ -53,5 +49,4 @@ header, and try again.
 .Xr mopd 8
 .Sh AUTHORS
 .An Lloyd Parkes
-.Sh BUGS
-This program only supports the VAX machine-id for now.
+.An Jason R. Thorpe
diff --git a/mopa.out/mopa.out.c b/mopcopy/mopcopy.c
similarity index 96%
rename from mopa.out/mopa.out.c
rename to mopcopy/mopcopy.c
index 6650f67..b8c4c53 100644
--- a/mopa.out/mopa.out.c
+++ b/mopcopy/mopcopy.c
@@ -1,6 +1,6 @@
-/*	$NetBSD: mopa.out.c,v 1.9 2002/06/06 22:52:26 thorpej Exp $	*/
+/*	$NetBSD: mopcopy.c,v 1.1 2002/06/06 23:01:01 thorpej Exp $	*/
 
-/* mopa.out - Convert a Unix format kernel into something that
+/* mopcopy - Convert a Unix format kernel into something that
  * can be transfered via MOP.
  *
  * This code was written while refering to the NetBSD/vax boot
@@ -49,7 +49,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mopa.out.c,v 1.9 2002/06/06 22:52:26 thorpej Exp $");
+__RCSID("$NetBSD: mopcopy.c,v 1.1 2002/06/06 23:01:01 thorpej Exp $");
 #endif
 
 #include "os.h"