diff --git a/net-mgmt/fetchconfig/Makefile b/net-mgmt/fetchconfig/Makefile
index f0a02d9e75f0..7467d037f9cc 100644
--- a/net-mgmt/fetchconfig/Makefile
+++ b/net-mgmt/fetchconfig/Makefile
@@ -26,22 +26,20 @@ MODULES=	model/Abstract.pm model/CiscoCAT.pm model/CiscoIOS.pm \
 		model/CiscoPIX.pm model/JunOS.pm model/TellabsMSR.pm
 PORTDOCS=	CHANGES README device_table.example
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '1s|.*|#!${PERL} -w|' ${WRKSRC}/${PORTNAME}.pl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
-	${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/model
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/model
 .for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${f} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/${f}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${f} \
+		${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/${PORTNAME}/${f}
 .endfor
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
  
 .include <bsd.port.mk>
diff --git a/net-mgmt/fetchconfig/pkg-plist b/net-mgmt/fetchconfig/pkg-plist
index 58051fce3f03..f063ae9e41f4 100644
--- a/net-mgmt/fetchconfig/pkg-plist
+++ b/net-mgmt/fetchconfig/pkg-plist
@@ -20,3 +20,6 @@ bin/fetchconfig
 %%SITE_PERL%%/fetchconfig/Logger.pm
 @dirrm %%SITE_PERL%%/fetchconfig/model
 @dirrm %%SITE_PERL%%/fetchconfig
+@dirrm lib/perl5/site_perl
+@dirrm lib/perl5
+@dirrm %%SITE_PERL%%