diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index 8c9e6460b278..b4197a4b49f4 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -16,24 +16,19 @@ USE_EMACS=	yes
 
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 ELS=		connection.el dictionary.el link.el
+DOCSDIR=	README
 
-NO_STAGE=	yes
 do-build:
 	cd ${WRKSRC}; ${EMACS_CMD} -batch -l lpath.el -f batch-byte-compile ${ELS}
 
 do-install:
-	${MKDIR} ${LISPDIR}
+	@${MKDIR} ${STAGEDIR}${LISPDIR}
 .for i in ${ELS} *.elc dictionary-init.el
-	${INSTALL_DATA} ${WRKSRC}/${i} ${LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${LISPDIR}
 .endfor
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in README
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/textproc/dictionary/pkg-plist b/textproc/dictionary/pkg-plist
index 0477452de15b..9f2cd68001bf 100644
--- a/textproc/dictionary/pkg-plist
+++ b/textproc/dictionary/pkg-plist
@@ -6,5 +6,3 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/dictionary/link.el
 %%EMACS_VERSION_SITE_LISPDIR%%/dictionary/link.elc
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/dictionary
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%