diff --git a/textproc/unroff/Makefile b/textproc/unroff/Makefile
index ba9e1521725f..964dea697daf 100644
--- a/textproc/unroff/Makefile
+++ b/textproc/unroff/Makefile
@@ -16,9 +16,9 @@ PATCHFILES=	me-misc-patch.gz misc-patch-2.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A programmable troff translator with backend for HTML
+COMMENT=	Programmable troff translator with backend for HTML
 
-LIB_DEPENDS=	elk.0:${PORTSDIR}/lang/elk
+LIB_DEPENDS=	libelk.so:${PORTSDIR}/lang/elk
 
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DBSD"	\
@@ -27,23 +27,19 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DBSD"	\
 		ELKDIR="${LOCALBASE}/share/elk"		\
 		DIR="${DATADIR}" ELK=""
 
-MAN1=		unroff.1 unroff-html.1 unroff-html-man.1 \
-		unroff-html-me.1 unroff-html-ms.1
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/unroff ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
-	@${MKDIR} ${DATADIR}/misc
+	${INSTALL_PROGRAM} ${WRKSRC}/src/unroff ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR}/misc
 .for i in doc/tmac.hyper misc/sample.unroff
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DATADIR}/misc
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR}/misc
 .endfor
 	${TAR} -C ${WRKSRC} -cf - scm | \
-		${TAR} -C ${DATADIR} --unlink -xf -
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/manual.ms ${DOCSDIR}
-.endif
+		${TAR} -C ${STAGEDIR}${DATADIR} --unlink -xf -
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/manual.ms ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/unroff/pkg-plist b/textproc/unroff/pkg-plist
index 4452c2616a39..a2dc58bf210c 100644
--- a/textproc/unroff/pkg-plist
+++ b/textproc/unroff/pkg-plist
@@ -1,4 +1,9 @@
 bin/unroff
+man/man1/unroff-html-man.1.gz
+man/man1/unroff-html-me.1.gz
+man/man1/unroff-html-ms.1.gz
+man/man1/unroff-html.1.gz
+man/man1/unroff.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/manual.ms
 %%DATADIR%%/misc/sample.unroff
 %%DATADIR%%/misc/tmac.hyper