diff --git a/textproc/kmfl-sil-galatia/Makefile b/textproc/kmfl-sil-galatia/Makefile
index 26c238b414fd..1bc54bbcfb42 100644
--- a/textproc/kmfl-sil-galatia/Makefile
+++ b/textproc/kmfl-sil-galatia/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	kmfl-sil-galatia
 PORTVERSION=	1.03
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=${DISTNAME}&filename=/ \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
@@ -18,45 +19,26 @@ USES=		dos2unix zip
 DOS2UNIX_FILES=	GrkPolyCompv${PORTVERSION:S|.||}.KMN
 NO_BUILD=	yes
 
-DOCSDIR_REL=	share/doc/kmfl/${PORTNAME}
-DOCSDIR=	${PREFIX}/${DOCSDIR_REL}
-KMFL_DIR=	share/kmfl
-KMFL_ICONS_DIR=	share/kmfl/icons
-
-PORTDOCS=	*
+OPTIONS_DEFINE=	DOCS
+DOCSDIR=	${PREFIX}/share/doc/kmfl/${PORTNAME}
 DOCSLIST=	Greek\ Poly\ Comp\ Kbrd\ Layout.pdf \
 		welcome.htm
 
-PLIST_FILES=	${KMFL_DIR}/GrkPolyCompv${PORTVERSION:S|.||}.kmn \
-		${KMFL_ICONS_DIR}/ALPHA.bmp
-PLIST_DIRSTRY=	${KMFL_ICONS_DIR} \
-		${KMFL_DIR}
+KMFL_DIR=	share/kmfl
+KMFL_ICONS_DIR=	share/kmfl/icons
+
+SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${LOCALBASE}/${KMFL_DIR} ${LOCALBASE}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${KMFL_DIR} ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
 	${CP} -f ${WRKSRC}/GrkPolyCompv${PORTVERSION:S|.||}.KMN \
 		${WRKSRC}/GrkPolyCompv${PORTVERSION:S|.||}.kmn
 	${INSTALL_DATA} ${WRKSRC}/GrkPolyCompv${PORTVERSION:S|.||}.kmn \
-		${LOCALBASE}/${KMFL_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ALPHA.bmp ${LOCALBASE}/${KMFL_ICONS_DIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+		${STAGEDIR}${PREFIX}/${KMFL_DIR}
+	${INSTALL_DATA} ${WRKSRC}/ALPHA.bmp ${STAGEDIR}${PREFIX}/${KMFL_ICONS_DIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	for doc in ${DOCSLIST} ; do \
-		${INSTALL_DATA} "${WRKSRC}/$$doc" ${DOCSDIR} ; \
+		${INSTALL_DATA} "${WRKSRC}/$$doc" ${STAGEDIR}${DOCSDIR} ; \
 	done
-.endif
-
-post-install:
-	@${ECHO_MSG} "--------------------------------------------------------"
-	@${ECHO_MSG} "  You should now have the new keyboard in the section"
-	@${ECHO_MSG} "  \"Greek\" in your SCIM/IBus menu. If you don't see it,"
-	@${ECHO_MSG} "  restart X."
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  The documentation is installed into:"
-	@${ECHO_MSG} "    ${DOCSDIR}"
-.endif
-	@${ECHO_MSG} "--------------------------------------------------------"
 
 .include <bsd.port.mk>
diff --git a/textproc/kmfl-sil-galatia/files/pkg-message.in b/textproc/kmfl-sil-galatia/files/pkg-message.in
new file mode 100644
index 000000000000..c762f5a60dc2
--- /dev/null
+++ b/textproc/kmfl-sil-galatia/files/pkg-message.in
@@ -0,0 +1,8 @@
+---------------------------------------------------------
+  You should now have the new keyboard in the section
+  "Greek" in your SCIM/IBus menu. If you don't see it,
+  restart X.
+
+  The documentation is installed into:
+  %%DOCSDIR%%
+---------------------------------------------------------
diff --git a/textproc/kmfl-sil-galatia/pkg-plist b/textproc/kmfl-sil-galatia/pkg-plist
new file mode 100644
index 000000000000..0744a553a903
--- /dev/null
+++ b/textproc/kmfl-sil-galatia/pkg-plist
@@ -0,0 +1,8 @@
+%%PORTDOCS%%%%DOCSDIR%%/Greek Poly Comp Kbrd Layout.pdf
+%%PORTDOCS%%%%DOCSDIR%%/welcome.htm
+share/kmfl/GrkPolyCompv103.kmn
+share/kmfl/icons/ALPHA.bmp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry share/doc/kmfl
+@dirrmtry share/kmfl/icons
+@dirrmtry share/kmfl