diff --git a/emulators/prodosemu/Makefile b/emulators/prodosemu/Makefile
index 7c128636bd92..177c81d0b1e7 100644
--- a/emulators/prodosemu/Makefile
+++ b/emulators/prodosemu/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   prodosemu
+# New ports collection makefile for:	prodosemu
 # Version required:	0.1
 # Date created:		18th February 1997
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
@@ -9,13 +9,22 @@
 DISTNAME=	prodosemu.v0.1
 PKGNAME=	prodosemu-0.1
 CATEGORIES=	emulators
-MASTER_SITES=   ftp://ftp.apple.asimov.net/pub/apple_II/emulators/prodosemu/ \
-		ftp://apple2.caltech.edu/pub/apple2/emulators/ \
-		ftp://apple.cabi.net/pub/apple_II/emulators/prodosemu/ \
-		ftp://ftp.aarnet.edu.au/pub/apple/apple_II/emulators/prodosemu/
+MASTER_SITES=	ftp://ftp.apple.asimov.net/pub/apple_II/emulators/prodosemu/ \
+		ftp://apple2.caltech.edu/pub/apple2/emulators/
+
+MAINTAINER=	ports@FreeBSD.org
 
 NO_PACKAGE=	yes
 RESTRICTED=	apple.rom copyright is owned by Apple and cannot be distributed.
 WRKSRC=		${WRKDIR}/prodosemu-v0.1
 
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/*.c
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/prodosemu
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/prodosemu
+.endif
+
 .include <bsd.port.mk>
diff --git a/emulators/prodosemu/files/patch-aa b/emulators/prodosemu/files/patch-aa
index ca9580f48a54..d87f838b0e40 100644
--- a/emulators/prodosemu/files/patch-aa
+++ b/emulators/prodosemu/files/patch-aa
@@ -1,6 +1,5 @@
-diff -rc prodosemu-v0.1/Makefile prodosemu/Makefile
-*** Makefile	Tue Jan  9 15:00:03 1996
---- Makefile	Tue Feb 18 09:40:38 1997
+*** Makefile.orig	Tue Jan  9 13:00:03 1996
+--- Makefile	Mon Jan 10 04:44:20 2000
 ***************
 *** 1,12 ****
   #
@@ -15,57 +14,76 @@ diff -rc prodosemu-v0.1/Makefile prodosemu/Makefile
   
   # Necessary libraries
   LIB = -lcurses -ltermcap
---- 1,28 ----
+--- 1,23 ----
   #
 ! # Makefile for ProDOS Emulator v0.1
 ! # FreeBSD modifications by Joel Sutton 18th Feb, 1997
 ! 
 ! # Paths to various places
 ! PREFIX?=	/usr/local
-! BINDIR=	${PREFIX}/bin
-! LIBDIR=	${PREFIX}/lib
-! MANDIR=	${PREFIX}/man
+! BINDIR=		${PREFIX}/bin
+! LIBDIR=		${PREFIX}/libdata
 ! ROMDIR=		${LIBDIR}/apple2
 ! ROM=		prodos-2e.rom
 ! 
 ! # Certain programs
-! INSTALL=	install -c
-! INSTALL_BIN=	${INSTALL} -s -o bin -g bin
-! INSTALL_DATA=	${INSTALL} -m 664
-! INSTALL_MAN=	${INSTALL} -m 444
-! CP?=		/bin/cp
-! MKDIR?=		-/bin/mkdir
+! CC?=		cc
+! MKDIR?=		mkdir -p
   
   all : prodos
   
   # Linux doesn't seem to like Randy Frank's beep code,
   # if you're compiling on something else, you could try not defining NOBEEP
-! OPT = -O2 -DNOBEEP -DROMFILE=\"${ROMDIR}/${ROM}\"
+! OPT = ${CFLAGS} -DNOBEEP -DROMFILE=\"${ROMDIR}/${ROM}\"
   
   # Necessary libraries
   LIB = -lcurses -ltermcap
 ***************
-*** 30,35 ****
+*** 16,35 ****
+  
+  # Build modules from source:
+  main.o: main.c apple.h
+! 	cc -c  $(OPT) main.c
+  6502.o: 6502.c apple.h
+! 	cc -c  $(OPT) 6502.c
+  mega2.o: mega2.c apple.h
+! 	cc -c  $(OPT) mega2.c
+  debug.o: debug.c apple.h
+! 	cc -c  $(OPT) debug.c
+  prodos.o: prodos.c apple.h
+! 	cc -c  $(OPT) prodos.c
+  
+  # Build the executale
   prodos  : $(OBJ)
-  	cc $(OPT) -o prodos $(OBJ) $(LIB)
+! 	cc $(OPT) -o prodos $(OBJ) $(LIB)
   
   # Clean up
   clean:
 ! 	rm *.o *~
---- 46,61 ----
-  prodos  : $(OBJ)
-  	cc $(OPT) -o prodos $(OBJ) $(LIB)
+--- 27,52 ----
+  
+  # Build modules from source:
+  main.o: main.c apple.h
+! 	$(CC) -c  $(OPT) main.c
+  6502.o: 6502.c apple.h
+! 	$(CC) -c  $(OPT) 6502.c
+  mega2.o: mega2.c apple.h
+! 	$(CC) -c  $(OPT) mega2.c
+  debug.o: debug.c apple.h
+! 	$(CC) -c  $(OPT) debug.c
+  prodos.o: prodos.c apple.h
+! 	$(CC) -c  $(OPT) prodos.c
+  
+  # Build the executale
+  prodos  : $(OBJ)
+! 	$(CC) $(OPT) -o prodos $(OBJ) $(LIB)
+! 
+! # Install the program
+! install: all
+! 	if [ ! -f ${ROMDIR} ]; then ${MKDIR} ${ROMDIR}; fi
+! 	${BSD_INSTALL_PROGRAM} prodos ${BINDIR}
+! 	${BSD_INSTALL_DATA} apple.rom ${ROMDIR}/${ROM}
   
-+ # Install the program
-+ install: all
-+ 	${MKDIR} ${BINDIR}
-+ 	${MKDIR} ${LIBDIR}
-+ 	${MKDIR} ${ROMDIR}
-+ 
-+ 	${INSTALL_BIN} prodos ${BINDIR}/
-+ 	${CP} apple.rom ${ROM}
-+ 	${INSTALL_DATA} ${ROM} ${ROMDIR}/
-+ 
   # Clean up
   clean:
 ! 	rm *.o 
diff --git a/emulators/prodosemu/files/patch-ac b/emulators/prodosemu/files/patch-ac
index 27cc257b05b9..33770c325d83 100644
--- a/emulators/prodosemu/files/patch-ac
+++ b/emulators/prodosemu/files/patch-ac
@@ -1,6 +1,5 @@
-diff -rc prodosemu-v0.1/main.c prodosemu/main.c
-*** main.c	Tue Jan  9 15:00:03 1996
---- main.c	Tue Feb 18 09:43:54 1997
+*** main.c.orig	Tue Jan  9 13:00:03 1996
+--- main.c	Sun Jan  9 06:47:30 2000
 ***************
 *** 9,16 ****
   
@@ -20,7 +19,7 @@ diff -rc prodosemu-v0.1/main.c prodosemu/main.c
 ! 
 ! /* Where is the default rom file?? */
 ! #ifndef ROMFILE
-! #define ROMFILE "/usr/local/lib/apple2/prodos-2e.rom"
+! #define ROMFILE "%%PREFIX%%/libdata/apple2/prodos-2e.rom"
 ! #endif
   
   extern char prodosroot[];
diff --git a/emulators/prodosemu/pkg-descr b/emulators/prodosemu/pkg-descr
index 69102cb3ac21..82c9e6f655fd 100644
--- a/emulators/prodosemu/pkg-descr
+++ b/emulators/prodosemu/pkg-descr
@@ -15,79 +15,6 @@ the ports collection.
 There is no man page for this program so I have included the slightly
 modified README at the end of this document. 
 
-Check out the following for all things Apple II:
-
-ftp://ftp.apple.asimov.net/		- Apple II archives 
-news://comp.emulators.apple2/		- Apple II news group
-
 Share and enjoy,
 Joel...
 sutton@aardvark.apana.org.au
-
-===========
-ProDOS Emulator by Matthew Ghio v0.1 of January 8, 1996
-
-To use prodosemu you will need a copy of the Apple IIe ROM.  To get the 
-ROM from an Apple IIe, boot into prodos/basic and do the following:
-
-  ]CALL -151
-  *C007:0
-  *2100<C100.FFFFM
-  *C006:0
-  *bsave apple.rom,a$2100,l$3f00
-
-Then use your favorite communications software to upload it to your unix
-system.  At this time you should also upload some common programs, such
-as BASIC.SYSTEM and SHRINKIT.  Put these files in the same directory as
-the prodos emulator.  You do not need a copy of ProDOS to run the emulator.
-
-To run ProDOS applications on your unix system, type 'prodos' and the
-application name, at your shell prompt.  The ProDOS emulator will load
-the application into a virtual Apple IIe and execute it.  Any ProDOS MLI
-calls are trapped and the equivalent file operations are performed via
-unix kernel calls.  Your current directory appears as a disk named /UNIX
-mounted on slot 7, drive 1.  For example, typing
-  prodos BASIC.SYSTEM
-will launch Applesoft Basic.  Type CAT,S7,D1 to see the files in your
-directory.  Remember that Prodos filenames are UPPERCASE and limited to 15
-characters.  (Prodosemu actually does allow you to create and access
-filenames longer than 15 characters, but only those filenames 15 characters
-or less will show up in directory listings.  This is due to the fact that
-Prodos's directory entries have a fixed size buffer which can only hold 15
-characters.)  When you are finished with basic, type BYE to return to the
-unix shell prompt.
-
-If you want to make another directory the working directory when running
-ProDOS applications, use the -w command line option.  By default, the
-working directory becomes the root of the similated ProDOS filesystem.
-If you wish to make another directory the root of the ProDOS filesystem
-while launching prodos, use the -r option.  The program does not do a
-chroot, and it is possible to get out of the ProDOS root directory by
-using .. or following a symbolic link.
-
-As files are read and written by Prodos applications to the simulated
-filesystem, they are read and written to the corresponding directory
-in your unix filesystem.  Prodos-specific filetype information is stored
-in a .prodosdir file, which is automatically created in each directory
-if it does not already exist.  Filetypes are ignored by Prodosemu when
-launching applications.  Because the ProDOS Emulator does not use disk
-images, disk copiers such as Copy II Plus will not work.  Ordinary file
-copiers and other utilities work fine.
-
-On an Apple II, the up arrow is Control-K, down is Control-J, left is
-Control-H, and right is Control-U.  You may need to use these control
-characters in some applications.
-
-This program uses Randy Frank's 65C02 emulator and I/O code.  While the
-emulation is running, you can use the following key sequences:
-  Ctrl-A Q       Quits
-  Ctrl-A D       Enters the debugger
-  Ctrl-A 0       Toggles the state of the open-apple key
-  Ctrl-A 1       Toggles the state of the closed-apple key
-  Ctrl-A S       Inputs a control-s
-  Ctrl-A Ctrl-A  Inputs a real control-a
-After doing a Control-A 0 to toggle the state of the open-apple key, don't
-forget to do another Ctrl-A 0 to put it back!
-
-The files 6502.c, mega2.c, and debug.c are copyright 1990 Randy Frank and
-are distrbuted under the included license agreement.
diff --git a/emulators/prodosemu/pkg-plist b/emulators/prodosemu/pkg-plist
index a80fea752ec1..629ba76fa0d6 100644
--- a/emulators/prodosemu/pkg-plist
+++ b/emulators/prodosemu/pkg-plist
@@ -1,3 +1,5 @@
 bin/prodos
-lib/apple2/prodos-2e.rom
-@dirrm lib/apple2
+libdata/apple2/prodos-2e.rom
+share/doc/prodosemu/README
+@dirrm share/doc/prodosemu
+@dirrm libdata/apple2