diff --git a/chinese/taipeifonts/Makefile b/chinese/taipeifonts/Makefile
index c49eaeb3f0f..b5d53126564 100644
--- a/chinese/taipeifonts/Makefile
+++ b/chinese/taipeifonts/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2000/06/09 06:57:59 kevlo Exp $
+# $OpenBSD: Makefile,v 1.5 2000/08/22 04:13:58 kevlo Exp $
 
 DISTNAME=       chinese-fonts-taipei
 CATEGORIES=     chinese x11
+NEED_VERSION=	1.319
 DIST_SUBDIR=    chinese-fonts
 
 MASTER_SITES=	ftp://linux.cis.nctu.edu.tw/packages/chinese/fonts/taipeifont/
@@ -20,17 +21,16 @@ DISTFILES=	${FONTS}
 NO_BUILD=	Yes
 EXTRACT_ONLY=
 
-USE_IMAKE=	Yes
-FAKE=		Yes
+CONFIGURE_STYLE=	imake
 
-FONTDIR=${PREFIX}/lib/X11/fonts/chinese
+FONTDIR=	${PREFIX}/lib/X11/fonts/chinese
 
 post-extract:
 	@mkdir -p ${WRKDIST}
-	@cp ${FILESDIR}/Imakefile ${FILESDIR}/taipei.alias ${FILESDIR}/fonts.dir ${WRKDIST}
+	@cp ${FILESDIR}/Imakefile ${FILESDIR}/taipei.alias ${WRKDIST}
 	@for i in ${FONTS} ; do cp $(FULLDISTDIR)/$$i ${WRKDIST}; done
 
 post-install:
-	@cp ${WRKDIST}/fonts.dir ${FONTDIR}
+	@cd ${FONTDIR} && mv fonts.alias fonts.alias-taipei
 
 .include <bsd.port.mk>
diff --git a/chinese/taipeifonts/files/fonts.dir b/chinese/taipeifonts/files/fonts.dir
deleted file mode 100644
index 597c7abc6de..00000000000
--- a/chinese/taipeifonts/files/fonts.dir
+++ /dev/null
@@ -1,5 +0,0 @@
-4
-taipei16.pcf.gz  taipei16
-taipei15.pcf.gz  taipei15
-taipei24.pcf.gz  taipei24
-taipeik24.pcf.gz taipeik24
diff --git a/chinese/taipeifonts/pkg/PLIST b/chinese/taipeifonts/pkg/PLIST
index 538c50a91c0..7b5ed56cae2 100644
--- a/chinese/taipeifonts/pkg/PLIST
+++ b/chinese/taipeifonts/pkg/PLIST
@@ -1,8 +1,12 @@
-lib/X11/fonts/chinese/fonts.alias
-lib/X11/fonts/chinese/fonts.dir
+@comment $OpenBSD: PLIST,v 1.4 2000/08/22 04:14:13 kevlo Exp $
+lib/X11/fonts/chinese/fonts.alias-taipei
 lib/X11/fonts/chinese/taipei15.pcf.gz
 lib/X11/fonts/chinese/taipei16.pcf.gz
 lib/X11/fonts/chinese/taipei24.pcf.gz
 lib/X11/fonts/chinese/taipeik24.pcf.gz
+@exec cat %B/fonts.alias-* >%B/fonts.alias
 @exec echo "Remember to add %B to your font path."
+@exec /usr/X11R6/bin/mkfontdir %B || true
+@unexec cat %B/fonts.alias-* >%B/fonts.alias
+@unexec /usr/X11R6/bin/mkfontdir %B || true
 @unexec echo "Remove %B manually if it's now empty"