diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 35b84a1364b3..09ec607f0950 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -1,22 +1,22 @@
 # Created by: joerg
 
 PORTNAME=	pcemu
 PORTVERSION=	1.01b
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/joerg
 DISTNAME=	pcemu1.01alpha
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	8086 PC emulator, by David Hedley
 
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 RUN_DEPENDS=	mkfontscale:x11-fonts/mkfontscale
 
-USES=		dos2unix xorg
+USES=		dos2unix xorg fonts
 USE_XORG=	x11 xext
 DOS2UNIX_FILES=	programs/config.sys
-MAKE_ENV=	FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR}
+MAKE_ENV=	FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR} FONTSDIR=${FONTSDIR}
 MAKE_ARGS=	CC="${CC}"
 
 .include <bsd.port.mk>
diff --git a/emulators/pcemu/files/patch-aa b/emulators/pcemu/files/patch-aa
index 91ccc06dbd69..58a0d5051b9e 100644
--- a/emulators/pcemu/files/patch-aa
+++ b/emulators/pcemu/files/patch-aa
@@ -1,60 +1,60 @@
 *** Makefile.orig	Mon Mar 27 21:27:28 1995
 --- Makefile	Mon Mar 27 22:52:07 1995
 ***************
 *** 49,58 ****
   # been known to crash the emulator when running on certain machines (80x86
   # based PCs under Linux, and HPs running HPUX). 
   
   CC      = gcc
 ! OPTIONS = -DBOOT720 -DBIG_ENDIAN -DALIGNED_ACCESS -DBIGCASE -DINLINE_FUNCTIONS 
 ! XROOT   = /usr/local/X11R5
 ! CFLAGS  = -I$(XROOT)/include -O2 #-fomit-frame-pointer
   
   # You may need to add -N to the LFLAGS if you get sporadic segmentation
   # faults. So far I have only needed to do this when compiling under Linux
 --- 49,63 ----
   # been known to crash the emulator when running on certain machines (80x86
   # based PCs under Linux, and HPs running HPUX). 
   
 + .include "Makefile.inc"
 + 
   CC      = gcc
 ! #OPTIONS = -DBOOT720 -DBIG_ENDIAN -DALIGNED_ACCESS -DBIGCASE -DINLINE_FUNCTIONS
 ! OPTIONS = -DBOOT720 -DLITTLE_ENDIAN -DBIGCASE -DINLINE_FUNCTIONS \
 ! 	-DBOOTFILE=\"${LOCALPREFIX}/lib/pcemu/DriveA\"
 ! #XROOT   = /usr/local/X11R5
 ! XROOT   = $(LOCALBASE)
 ! CFLAGS  = -I$(XROOT)/include -O2 -pipe #-fomit-frame-pointer
   
   # You may need to add -N to the LFLAGS if you get sporadic segmentation
   # faults. So far I have only needed to do this when compiling under Linux
 ***************
 *** 86,88 ****
 --- 91,117 ----
   
   clean:
   	rm $(PROGNAME) *.o
 + 
 + bootstrapper:
 + 	(cd bootstrap; make unpack)
 + 
 + #mode 0666 is required for DriveA, alas
 + install: pcemu bootstrapper
 + 	-mkdir -p ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu \
 + 		${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc \
-+ 		${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font \
++ 		${STAGEDIR}${FONTSDIR} \
 + 		${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/C \
 + 		${STAGEDIR}/${LOCALPREFIX}/bin
 + 	install -c -s pcemu ${STAGEDIR}/${LOCALPREFIX}/bin/
 + 	install -c -m 666 bootstrap/display.bin \
 + 		${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/DriveA
 + 	install -c -m 644 BUGS CHANGES README TODO  bootstrap/README.FreeBSD \
 + 		programs/lredir.readme \
 + 		${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc/
 + 	rm -f ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz
 + 	gzip --best < report.ps > ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/doc/report.ps.gz
 + 	rm -f ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z
-+ 	bdftopcf vga.bdf | compress > ${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/font/vga.pcf.Z
++ 	bdftopcf vga.bdf | compress > ${STAGEDIR}${FONTSDIR}/vga.pcf.Z
 + 	install -c -m 644 programs/vga50.com programs/config.sys \
 + 		programs/dumpdisk.exe programs/lredir.exe programs/emufs.sys \
 + 		${STAGEDIR}/${LOCALPREFIX}/lib/pcemu/C
diff --git a/emulators/pcemu/pkg-plist b/emulators/pcemu/pkg-plist
index fdfbbe0e70b1..481dcda71527 100644
--- a/emulators/pcemu/pkg-plist
+++ b/emulators/pcemu/pkg-plist
@@ -1,16 +1,15 @@
 bin/pcemu
 lib/pcemu/doc/BUGS
 lib/pcemu/doc/CHANGES
 lib/pcemu/doc/README
 lib/pcemu/doc/TODO
 lib/pcemu/doc/README.FreeBSD
 lib/pcemu/doc/lredir.readme
 lib/pcemu/doc/report.ps.gz
-lib/pcemu/font/vga.pcf.Z
+%%FONTSDIR%%/vga.pcf.Z
 lib/pcemu/C/vga50.com
 lib/pcemu/C/config.sys
 lib/pcemu/C/dumpdisk.exe
 lib/pcemu/C/lredir.exe
 lib/pcemu/C/emufs.sys
 lib/pcemu/DriveA
-@fcfontsdir lib/pcemu/font