diff --git a/japanese/font-motoya-al/Makefile b/japanese/font-motoya-al/Makefile
index 5617acda4fb5..eb499920fd20 100644
--- a/japanese/font-motoya-al/Makefile
+++ b/japanese/font-motoya-al/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	motoya-al
 PORTVERSION=	0.0.20100921
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	LOCAL/hrs
 PKGNAMEPREFIX=	ja-font-
@@ -11,8 +11,10 @@ DISTNAME=	${PORTNAME}-fonts-${PORTVERSION:S,^0.0.,,}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Free Japanese fonts by MOTOYA
 
+LICENSE=	APACHE20
+
 USES=		fonts:fc tar:bzip2
-FONTNAME=	TTF
+FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -23,23 +25,20 @@ PORTDOCS=	newsrelease20100921.pdf
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/MTL*.ttf .
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-motoya-al.conf \
-	    ${FILESDIR}/62-fonts-motoya-al.conf \
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \
+	    ${FILESDIR}/62-fonts-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-motoya-al.conf \
-	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-motoya-al.conf
-	${LN} -s -f ../conf.avail/62-fonts-motoya-al.conf \
-	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-motoya-al.conf
+	${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/font-motoya-al/pkg-plist b/japanese/font-motoya-al/pkg-plist
index aa9ba6e8acdf..d8e0b58f5ae3 100644
--- a/japanese/font-motoya-al/pkg-plist
+++ b/japanese/font-motoya-al/pkg-plist
@@ -1,8 +1,6 @@
-%%DATADIR%%/MTLc3m.ttf
-%%DATADIR%%/MTLmr3m.ttf
+%%FONTSDIR%%/MTLc3m.ttf
+%%FONTSDIR%%/MTLmr3m.ttf
 etc/fonts/conf.avail/20-unhint-motoya-al.conf
 etc/fonts/conf.avail/62-fonts-motoya-al.conf
 etc/fonts/conf.d/20-unhint-motoya-al.conf
 etc/fonts/conf.d/62-fonts-motoya-al.conf
-%%FONTSDIR%%/MTLc3m.ttf
-%%FONTSDIR%%/MTLmr3m.ttf