diff --git a/dns/p5-Net-DNS-Resolver-Programmable/Makefile b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
index 0f86cfa201b8..27e0d1f68c49 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/Makefile
+++ b/dns/p5-Net-DNS-Resolver-Programmable/Makefile
@@ -15,7 +15,6 @@ COMMENT=	Programmable DNS resolver for off-line testing
 BUILD_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-NO_STAGE=	yes
 USES=		perl5
 USE_PERL5=	modbuild
 
@@ -23,12 +22,14 @@ MAN3=		Net::DNS::Resolver::Programmable.3
 PORTDOCS=	CHANGES README TODO
 DOCSDIR=	${PREFIX}/share/doc/p5-Net-DNS-Resolver-Programmable
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/dns/p5-Net-DNS-Resolver-Programmable/pkg-plist b/dns/p5-Net-DNS-Resolver-Programmable/pkg-plist
index 3aa630f247fc..eece729aea3f 100644
--- a/dns/p5-Net-DNS-Resolver-Programmable/pkg-plist
+++ b/dns/p5-Net-DNS-Resolver-Programmable/pkg-plist
@@ -1,4 +1,5 @@
 %%SITE_PERL%%/Net/DNS/Resolver/Programmable.pm
+%%PERL5_MAN3%%/Net::DNS::Resolver::Programmable.3.gz
 @dirrm %%SITE_PERL%%/Net/DNS/Resolver
 @dirrm %%SITE_PERL%%/Net/DNS
 @dirrmtry %%SITE_PERL%%/Net