diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index 72e7d58fcd7d..73622f17c65a 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -32,57 +32,20 @@ ALL_TARGET=	pfaedit
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	020312
+DIST_VER=	020507
 EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
 
 .if !defined(NOPORTDOCS)
-DOC_VER=	020214
+DOC_VER=	020416
 DOCFILE=	${PORTNAME}_htdocs-${DOC_VER}.tgz
-DOCFILES=	AA-Comparison.html HotKeys.html MetaFont.html \
-		Problems-MacOSX.html accented.html bezier.html bitmapview.html \
-		charview.html cidmenu.html cliargs.html corpchar.html \
-		diffs.html editexample.html editmenu.html elementmenu.html \
-		errrecovery.html faq.html faqFS.html faqFrame.html \
-		filemenu.html fontinfo.html fontview.html future.html \
-		getinfo.html helpmenu.html hinting.html hintsmenu.html \
-		index.html license.html locale.html macformats.html \
-		metricsmenu.html metricsview.html oldchangelog.html \
-		otherlinks.html overview.html pcf-format.html pointmenu.html \
-		print.html problems.html scripting.html sfd.html \
-		sfdformat.html splinefont.html src.html transform.html \
-		viewmenu.html views.html windowmenu.html xres.html \
-		corpchar.txt AmbrosiaFV-bm.png AmbrosiaFV.png BitmapView.png \
-		C1.png C10.png C2.png C3.png C4.png C5.png C6.png C7.png \
-		C8.png C9.png CaslonOriginality.png CharPrint.png \
-		CharView.png Constrain1_1.png Constrain1_2.png \
-		Constrain2_1.png Constrain2_2.png CyrilItalicComp.png \
-		Eback.png EbackTtf.png Efore.png EforeTtf.png \
-		Ehinted.png EhintedTtf.png FontDisplay.png FontSample.png \
-		GridFitM.png H-bm.png H-gm.png HI.hints.png HI.nohints.png \
-		HebrewMetrics.png Hints.png ItalicCompCaslon.png \
-		ItalicCompGalliard.png MetricsView.png NoPointHint.png \
-		PageSetup.png Print.png ReviewHints.png Spacem_1.png Spacem_2.png \
-		aacutebase.png aacutemid.png acenter.png ahighest.png autokern.png \
-		autowidth.png bitmapchar.png bitmapsavail.png bvlayers.png \
-		bvtools.png charinfo.png charview-vert.png charview2.png cpodd.png \
-		expandedlines.png expandstroke.png findprobs.png fontinfo-cid.png \
-		fontinfo-comment.png fontinfo-encoding.png fontinfo-panose.png \
-		fontinfo-private.png fontinfo-ps.png fontinfo-ttfname.png \
-		fontinfo-ttfvals.png fontinfo.png fontview-cid.png \
-		fontview.fr.png fontview.ru.png hexley.png kanjichar.png  \
-		kanjifont.png layers.png newfont.png outlinechar.png \
-		overlappedlines.png phi-hints-filled.png phi-hints-outline.png \
-		phi-nohints-filled.png phi-nohints-outline.png pointinfo.png \
-		privatekey.png privatekeymenu.png serif.png serif2.png \
-		setwidth.png splash.png strokechar.png tools.png transform.png \
-		twolines.png bezier.gif pnts.gif splines.gif Encodings.ps.gz \
-		document.nvd
 .endif
 
 .if !defined(NOPORTDOCS)
 post-extract:
-	${MKDIR} ${WRKDIR}/html
+	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
 	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
+	${RM} ${WRKDIR}/html/cidmaps.tgz
+	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
 .endif
 
 post-patch:
@@ -98,11 +61,10 @@ post-patch:
 		${WRKSRC}/*/[mM]akefile.*
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/*.cidmap ${DATADIR}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .if !defined(NOPORTDOCS)
-	(cd ${WRKDIR}/html; ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR})
+	${INSTALL_DATA} ${WRKDIR}/html/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index fab50db77739..9140349bd2a1 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,3 @@
-MD5 (pfaedit_full-020312.tgz) = 1352e863091ec1c7981072f72fddcd7e
-MD5 (cidmaps.tgz) = 888b70dd745242ba1f0f39015c3e8c88
-MD5 (pfaedit_htdocs-020214.tgz) = 4d05e14c3ad4a25edb3a5da93dcbbf83
+MD5 (pfaedit_full-020507.tgz) = 965f86da97b33051cdc526f9acc28502
+MD5 (cidmaps.tgz) = d40e9a779f620a5358ab782d6d76eb2f
+MD5 (pfaedit_htdocs-020416.tgz) = df31ad47fbbab26642550bc91ab52478
diff --git a/print/fontforge/files/patch-Makefile.in b/print/fontforge/files/patch-Makefile.in
new file mode 100644
index 000000000000..91d5f26e1f21
--- /dev/null
+++ b/print/fontforge/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	Sat Mar 16 08:43:35 2002
++++ Makefile.in	Sun May 12 18:02:27 2002
+@@ -37,15 +37,15 @@
+ 	mkdir -p $(bindir)
+ 	mkdir -p $(mandir)/man1
+ 	mkdir -p $(sharedir)
+-	cp pfaedit/pfaedit $(bindir)
+-	cp pfaedit/sfddiff $(bindir)
+-	cp pfaedit/pfaedit.*.ui $(sharedir)
++	${BSD_INSTALL_PROGRAM} pfaedit/pfaedit $(bindir)
++	${BSD_INSTALL_PROGRAM} pfaedit/sfddiff $(bindir)
++	${BSD_INSTALL_DATA} pfaedit/pfaedit.*.ui $(sharedir)
+ #The next line will fail for most installs. If you have downloaded the cidmaps
+ # this will install them. If you haven't it won't. You only need the cidmaps
+ # if you are editing CID keyed files (and even then you can live without them
+-	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
+-	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
+-	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
++	${BSD_INSTALL_DATA} $(srcdir)/cidmap/*.cidmap $(sharedir)
++	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
++	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
+ 
+ uninstall:
+ 	-rm $(bindir)/pfaedit
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index ceaf1fc4caed..6e30938b78d3 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -3,6 +3,8 @@ bin/sfddiff
 %%PORTDOCS%%share/doc/pfaedit/AA-Comparison.html
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV-bm.png
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV.png
+%%PORTDOCS%%share/doc/pfaedit/Anna.gif
+%%PORTDOCS%%share/doc/pfaedit/Antigone.gif
 %%PORTDOCS%%share/doc/pfaedit/BitmapView.png
 %%PORTDOCS%%share/doc/pfaedit/C1.png
 %%PORTDOCS%%share/doc/pfaedit/C10.png
@@ -134,11 +136,13 @@ bin/sfddiff
 %%PORTDOCS%%share/doc/pfaedit/privatekey.png
 %%PORTDOCS%%share/doc/pfaedit/privatekeymenu.png
 %%PORTDOCS%%share/doc/pfaedit/problems.html
+%%PORTDOCS%%share/doc/pfaedit/quotations.html
 %%PORTDOCS%%share/doc/pfaedit/scripting.html
 %%PORTDOCS%%share/doc/pfaedit/serif.png
 %%PORTDOCS%%share/doc/pfaedit/serif2.png
 %%PORTDOCS%%share/doc/pfaedit/setwidth.png
 %%PORTDOCS%%share/doc/pfaedit/sfd.html
+%%PORTDOCS%%share/doc/pfaedit/sfddiff.html
 %%PORTDOCS%%share/doc/pfaedit/sfdformat.html
 %%PORTDOCS%%share/doc/pfaedit/splash.png
 %%PORTDOCS%%share/doc/pfaedit/splinefont.html
diff --git a/print/pfaedit/Makefile b/print/pfaedit/Makefile
index 72e7d58fcd7d..73622f17c65a 100644
--- a/print/pfaedit/Makefile
+++ b/print/pfaedit/Makefile
@@ -32,57 +32,20 @@ ALL_TARGET=	pfaedit
 
 MAN1=		pfaedit.1 sfddiff.1
 
-DIST_VER=	020312
+DIST_VER=	020507
 EXTRACT_ONLY=	${PORTNAME}_full-${DIST_VER}.tgz cidmaps.tgz
 
 .if !defined(NOPORTDOCS)
-DOC_VER=	020214
+DOC_VER=	020416
 DOCFILE=	${PORTNAME}_htdocs-${DOC_VER}.tgz
-DOCFILES=	AA-Comparison.html HotKeys.html MetaFont.html \
-		Problems-MacOSX.html accented.html bezier.html bitmapview.html \
-		charview.html cidmenu.html cliargs.html corpchar.html \
-		diffs.html editexample.html editmenu.html elementmenu.html \
-		errrecovery.html faq.html faqFS.html faqFrame.html \
-		filemenu.html fontinfo.html fontview.html future.html \
-		getinfo.html helpmenu.html hinting.html hintsmenu.html \
-		index.html license.html locale.html macformats.html \
-		metricsmenu.html metricsview.html oldchangelog.html \
-		otherlinks.html overview.html pcf-format.html pointmenu.html \
-		print.html problems.html scripting.html sfd.html \
-		sfdformat.html splinefont.html src.html transform.html \
-		viewmenu.html views.html windowmenu.html xres.html \
-		corpchar.txt AmbrosiaFV-bm.png AmbrosiaFV.png BitmapView.png \
-		C1.png C10.png C2.png C3.png C4.png C5.png C6.png C7.png \
-		C8.png C9.png CaslonOriginality.png CharPrint.png \
-		CharView.png Constrain1_1.png Constrain1_2.png \
-		Constrain2_1.png Constrain2_2.png CyrilItalicComp.png \
-		Eback.png EbackTtf.png Efore.png EforeTtf.png \
-		Ehinted.png EhintedTtf.png FontDisplay.png FontSample.png \
-		GridFitM.png H-bm.png H-gm.png HI.hints.png HI.nohints.png \
-		HebrewMetrics.png Hints.png ItalicCompCaslon.png \
-		ItalicCompGalliard.png MetricsView.png NoPointHint.png \
-		PageSetup.png Print.png ReviewHints.png Spacem_1.png Spacem_2.png \
-		aacutebase.png aacutemid.png acenter.png ahighest.png autokern.png \
-		autowidth.png bitmapchar.png bitmapsavail.png bvlayers.png \
-		bvtools.png charinfo.png charview-vert.png charview2.png cpodd.png \
-		expandedlines.png expandstroke.png findprobs.png fontinfo-cid.png \
-		fontinfo-comment.png fontinfo-encoding.png fontinfo-panose.png \
-		fontinfo-private.png fontinfo-ps.png fontinfo-ttfname.png \
-		fontinfo-ttfvals.png fontinfo.png fontview-cid.png \
-		fontview.fr.png fontview.ru.png hexley.png kanjichar.png  \
-		kanjifont.png layers.png newfont.png outlinechar.png \
-		overlappedlines.png phi-hints-filled.png phi-hints-outline.png \
-		phi-nohints-filled.png phi-nohints-outline.png pointinfo.png \
-		privatekey.png privatekeymenu.png serif.png serif2.png \
-		setwidth.png splash.png strokechar.png tools.png transform.png \
-		twolines.png bezier.gif pnts.gif splines.gif Encodings.ps.gz \
-		document.nvd
 .endif
 
 .if !defined(NOPORTDOCS)
 post-extract:
-	${MKDIR} ${WRKDIR}/html
+	${MKDIR} ${WRKDIR}/html ${WRKSRC}/cidmap
 	${TAR} -xzC ${WRKDIR}/html -f ${DISTDIR}/${DOCFILE}
+	${RM} ${WRKDIR}/html/cidmaps.tgz
+	${MV} ${WRKDIR}/*.cidmap ${WRKSRC}/cidmap
 .endif
 
 post-patch:
@@ -98,11 +61,10 @@ post-patch:
 		${WRKSRC}/*/[mM]akefile.*
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/*.cidmap ${DATADIR}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
 .if !defined(NOPORTDOCS)
-	(cd ${WRKDIR}/html; ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR})
+	${INSTALL_DATA} ${WRKDIR}/html/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/pfaedit/distinfo b/print/pfaedit/distinfo
index fab50db77739..9140349bd2a1 100644
--- a/print/pfaedit/distinfo
+++ b/print/pfaedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (pfaedit_full-020312.tgz) = 1352e863091ec1c7981072f72fddcd7e
-MD5 (cidmaps.tgz) = 888b70dd745242ba1f0f39015c3e8c88
-MD5 (pfaedit_htdocs-020214.tgz) = 4d05e14c3ad4a25edb3a5da93dcbbf83
+MD5 (pfaedit_full-020507.tgz) = 965f86da97b33051cdc526f9acc28502
+MD5 (cidmaps.tgz) = d40e9a779f620a5358ab782d6d76eb2f
+MD5 (pfaedit_htdocs-020416.tgz) = df31ad47fbbab26642550bc91ab52478
diff --git a/print/pfaedit/files/patch-Makefile.in b/print/pfaedit/files/patch-Makefile.in
new file mode 100644
index 000000000000..91d5f26e1f21
--- /dev/null
+++ b/print/pfaedit/files/patch-Makefile.in
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	Sat Mar 16 08:43:35 2002
++++ Makefile.in	Sun May 12 18:02:27 2002
+@@ -37,15 +37,15 @@
+ 	mkdir -p $(bindir)
+ 	mkdir -p $(mandir)/man1
+ 	mkdir -p $(sharedir)
+-	cp pfaedit/pfaedit $(bindir)
+-	cp pfaedit/sfddiff $(bindir)
+-	cp pfaedit/pfaedit.*.ui $(sharedir)
++	${BSD_INSTALL_PROGRAM} pfaedit/pfaedit $(bindir)
++	${BSD_INSTALL_PROGRAM} pfaedit/sfddiff $(bindir)
++	${BSD_INSTALL_DATA} pfaedit/pfaedit.*.ui $(sharedir)
+ #The next line will fail for most installs. If you have downloaded the cidmaps
+ # this will install them. If you haven't it won't. You only need the cidmaps
+ # if you are editing CID keyed files (and even then you can live without them
+-	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
+-	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
+-	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
++	${BSD_INSTALL_DATA} $(srcdir)/cidmap/*.cidmap $(sharedir)
++	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
++	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
+ 
+ uninstall:
+ 	-rm $(bindir)/pfaedit
diff --git a/print/pfaedit/pkg-plist b/print/pfaedit/pkg-plist
index ceaf1fc4caed..6e30938b78d3 100644
--- a/print/pfaedit/pkg-plist
+++ b/print/pfaedit/pkg-plist
@@ -3,6 +3,8 @@ bin/sfddiff
 %%PORTDOCS%%share/doc/pfaedit/AA-Comparison.html
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV-bm.png
 %%PORTDOCS%%share/doc/pfaedit/AmbrosiaFV.png
+%%PORTDOCS%%share/doc/pfaedit/Anna.gif
+%%PORTDOCS%%share/doc/pfaedit/Antigone.gif
 %%PORTDOCS%%share/doc/pfaedit/BitmapView.png
 %%PORTDOCS%%share/doc/pfaedit/C1.png
 %%PORTDOCS%%share/doc/pfaedit/C10.png
@@ -134,11 +136,13 @@ bin/sfddiff
 %%PORTDOCS%%share/doc/pfaedit/privatekey.png
 %%PORTDOCS%%share/doc/pfaedit/privatekeymenu.png
 %%PORTDOCS%%share/doc/pfaedit/problems.html
+%%PORTDOCS%%share/doc/pfaedit/quotations.html
 %%PORTDOCS%%share/doc/pfaedit/scripting.html
 %%PORTDOCS%%share/doc/pfaedit/serif.png
 %%PORTDOCS%%share/doc/pfaedit/serif2.png
 %%PORTDOCS%%share/doc/pfaedit/setwidth.png
 %%PORTDOCS%%share/doc/pfaedit/sfd.html
+%%PORTDOCS%%share/doc/pfaedit/sfddiff.html
 %%PORTDOCS%%share/doc/pfaedit/sfdformat.html
 %%PORTDOCS%%share/doc/pfaedit/splash.png
 %%PORTDOCS%%share/doc/pfaedit/splinefont.html