diff --git a/net/hinfo/Makefile b/net/hinfo/Makefile
index 1bfe9c1804d8..329c03fe372f 100644
--- a/net/hinfo/Makefile
+++ b/net/hinfo/Makefile
@@ -24,31 +24,27 @@ DATADIR?=	${PREFIX}/lib/${PORTNAME}
 HINFO_DBFILES=	dnsbl.ins.pl whois.ins.pl
 HINFO_SCRIPTS=	hinfo hinfo-update myhostinfo.cgi
 
-MAN1=		hinfo.1
-MAN5=		hinfo.conf.5
-
 NO_BUILD=	yes
 
 # By default, we don't install myhostinfo.cgi.  Install it if you wish; it'll
 # already be patched for you.
-NO_STAGE=	yes
 post-extract:
 .for filename in ${HINFO_SCRIPTS}
 	${REINPLACE_CMD} -E '1s|^#!.+|#!${PERL}|' ${WRKSRC}/${filename}
 .endfor
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/hinfo ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/hinfo-update ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/hinfo.conf ${PREFIX}/etc/hinfo.conf.example
-.if !exists({PREFIX}/etc/hinfo.conf)
-	${INSTALL_DATA} ${WRKSRC}/hinfo.conf ${PREFIX}/etc/hinfo.conf
+	${INSTALL_SCRIPT} ${WRKSRC}/hinfo ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/hinfo-update ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/hinfo.conf ${STAGEDIR}${PREFIX}/etc/hinfo.conf.example
+.if !exists(${STAGEDIR}${PREFIX}/etc/hinfo.conf)
+	${INSTALL_DATA} ${WRKSRC}/hinfo.conf ${STAGEDIR}${PREFIX}/etc/hinfo.conf
 .endif
-	${INSTALL_MAN} ${WRKSRC}/hinfo.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/hinfo.conf.5 ${PREFIX}/man/man5/
-	@${MKDIR} ${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/hinfo.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/hinfo.conf.5 ${STAGEDIR}${PREFIX}/man/man5/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for filename in ${HINFO_DBFILES}
-	${INSTALL_DATA} ${WRKSRC}/${filename} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${filename} ${STAGEDIR}${DATADIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/hinfo/pkg-plist b/net/hinfo/pkg-plist
index a98c598f8371..7ff64007ee1c 100644
--- a/net/hinfo/pkg-plist
+++ b/net/hinfo/pkg-plist
@@ -1,5 +1,10 @@
+man/man1/hinfo.1.gz
+man/man5/hinfo.conf.5.gz
 bin/hinfo
 etc/hinfo.conf
 etc/hinfo.conf.example
 sbin/hinfo-update
-@unexec rm -fR %%PREFIX%%/lib/hinfo
+%%DATADIR%%/dnsbl.ins.pl
+%%DATADIR%%/whois.ins.pl
+@dirrm %%DATADIR%%
+@dirrmtry lib/hinfo