diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 8bf5780c6f2b..cae8c48df4d7 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	flim
 PORTVERSION=	1.14.9
-PORTREVISION=	18
+PORTREVISION=	19
 PORTEPOCH=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/${PORTNAME}/${PORTNAME}-${DISTVERSION:R}/
@@ -26,7 +26,8 @@ NO_ARCH=	yes
 ALL_TARGET=	elc
 
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
-		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}"
+		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 
 INFO=		mime-en mime-ja
 
diff --git a/editors/flim/pkg-plist b/editors/flim/pkg-plist
index b1112f3bb69b..4bafb5d6cd35 100644
--- a/editors/flim/pkg-plist
+++ b/editors/flim/pkg-plist
@@ -1,75 +1,75 @@
-%%EMACS_SITE_LISPDIR%%/flim/eword-decode.el
-%%EMACS_SITE_LISPDIR%%/flim/eword-decode.elc
-%%EMACS_SITE_LISPDIR%%/flim/eword-encode.el
-%%EMACS_SITE_LISPDIR%%/flim/eword-encode.elc
-%%EMACS_SITE_LISPDIR%%/flim/hex-util.el
-%%EMACS_SITE_LISPDIR%%/flim/hex-util.elc
-%%EMACS_SITE_LISPDIR%%/flim/hmac-def.el
-%%EMACS_SITE_LISPDIR%%/flim/hmac-def.elc
-%%EMACS_SITE_LISPDIR%%/flim/hmac-md5.el
-%%EMACS_SITE_LISPDIR%%/flim/hmac-md5.elc
-%%EMACS_SITE_LISPDIR%%/flim/hmac-sha1.el
-%%EMACS_SITE_LISPDIR%%/flim/hmac-sha1.elc
-%%EMACS_SITE_LISPDIR%%/flim/luna.el
-%%EMACS_SITE_LISPDIR%%/flim/luna.elc
-%%EMACS_SITE_LISPDIR%%/flim/lunit.el
-%%EMACS_SITE_LISPDIR%%/flim/lunit.elc
-%%EMACS_SITE_LISPDIR%%/flim/md4.el
-%%EMACS_SITE_LISPDIR%%/flim/md4.elc
-%%EMACS_SITE_LISPDIR%%/flim/md5.el
-%%EMACS_SITE_LISPDIR%%/flim/md5.elc
-%%EMACS_SITE_LISPDIR%%/flim/mel-b-ccl.el
-%%EMACS_SITE_LISPDIR%%/flim/mel-b-ccl.elc
-%%EMACS_SITE_LISPDIR%%/flim/mel-b-el.el
-%%EMACS_SITE_LISPDIR%%/flim/mel-b-el.elc
-%%EMACS_SITE_LISPDIR%%/flim/mel-g.el
-%%EMACS_SITE_LISPDIR%%/flim/mel-g.elc
-%%EMACS_SITE_LISPDIR%%/flim/mel-q-ccl.el
-%%EMACS_SITE_LISPDIR%%/flim/mel-q-ccl.elc
-%%EMACS_SITE_LISPDIR%%/flim/mel-q.el
-%%EMACS_SITE_LISPDIR%%/flim/mel-q.elc
-%%EMACS_SITE_LISPDIR%%/flim/mel-u.el
-%%EMACS_SITE_LISPDIR%%/flim/mel-u.elc
-%%EMACS_SITE_LISPDIR%%/flim/mel.el
-%%EMACS_SITE_LISPDIR%%/flim/mel.elc
-%%EMACS_SITE_LISPDIR%%/flim/mime-conf.el
-%%EMACS_SITE_LISPDIR%%/flim/mime-conf.elc
-%%EMACS_SITE_LISPDIR%%/flim/mime-def.el
-%%EMACS_SITE_LISPDIR%%/flim/mime-def.elc
-%%EMACS_SITE_LISPDIR%%/flim/mime-parse.el
-%%EMACS_SITE_LISPDIR%%/flim/mime-parse.elc
-%%EMACS_SITE_LISPDIR%%/flim/mime.el
-%%EMACS_SITE_LISPDIR%%/flim/mime.elc
-%%EMACS_SITE_LISPDIR%%/flim/mmbuffer.el
-%%EMACS_SITE_LISPDIR%%/flim/mmbuffer.elc
-%%EMACS_SITE_LISPDIR%%/flim/mmcooked.el
-%%EMACS_SITE_LISPDIR%%/flim/mmcooked.elc
-%%EMACS_SITE_LISPDIR%%/flim/mmexternal.el
-%%EMACS_SITE_LISPDIR%%/flim/mmexternal.elc
-%%EMACS_SITE_LISPDIR%%/flim/mmgeneric.el
-%%EMACS_SITE_LISPDIR%%/flim/mmgeneric.elc
-%%EMACS_SITE_LISPDIR%%/flim/ntlm.el
-%%EMACS_SITE_LISPDIR%%/flim/ntlm.elc
-%%EMACS_SITE_LISPDIR%%/flim/qmtp.el
-%%EMACS_SITE_LISPDIR%%/flim/qmtp.elc
-%%EMACS_SITE_LISPDIR%%/flim/sasl-cram.el
-%%EMACS_SITE_LISPDIR%%/flim/sasl-cram.elc
-%%EMACS_SITE_LISPDIR%%/flim/sasl-digest.el
-%%EMACS_SITE_LISPDIR%%/flim/sasl-digest.elc
-%%EMACS_SITE_LISPDIR%%/flim/sasl-ntlm.el
-%%EMACS_SITE_LISPDIR%%/flim/sasl-ntlm.elc
-%%EMACS_SITE_LISPDIR%%/flim/sasl-scram.el
-%%EMACS_SITE_LISPDIR%%/flim/sasl-scram.elc
-%%EMACS_SITE_LISPDIR%%/flim/sasl.el
-%%EMACS_SITE_LISPDIR%%/flim/sasl.elc
-%%EMACS_SITE_LISPDIR%%/flim/sha1-el.el
-%%EMACS_SITE_LISPDIR%%/flim/sha1-el.elc
-%%EMACS_SITE_LISPDIR%%/flim/sha1.el
-%%EMACS_SITE_LISPDIR%%/flim/sha1.elc
-%%EMACS_SITE_LISPDIR%%/flim/smtp.el
-%%EMACS_SITE_LISPDIR%%/flim/smtp.elc
-%%EMACS_SITE_LISPDIR%%/flim/std11.el
-%%EMACS_SITE_LISPDIR%%/flim/std11.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-decode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/eword-encode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hex-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/hmac-sha1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/luna.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/lunit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md4.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/md5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-ccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-b-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-g.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q-ccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-q.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel-u.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mel.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-conf.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmbuffer.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmcooked.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmexternal.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/mmgeneric.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/ntlm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/qmtp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-cram.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-digest.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-ntlm.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl-scram.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sasl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1-el.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/sha1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/smtp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.el
+%%EMACS_VERSION_SITE_LISPDIR%%/flim/std11.elc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.en