Index: Mk/Uses/perl5.mk
===================================================================
--- Mk/Uses/perl5.mk
+++ Mk/Uses/perl5.mk
@@ -40,7 +40,7 @@
 IGNORE=	Incorrect 'USES+=perl5:${perl5_ARGS}' perl5 takes no arguments
 .endif
 
-USE_PERL5?=	run build
+USE_PERL5?=	autoplist build run
 
 # remove when 5.20 goes away.
 .sinclude "${LOCALBASE}/etc/perl5_version"
@@ -290,7 +290,7 @@
 	@(if [ -d ${STAGEDIR}${PACKLIST_DIR} ] ; then \
 		${FIND} ${STAGEDIR}${PACKLIST_DIR} -name .packlist | while read f ; do \
 			${SED} -i '' 's|^${STAGEDIR}||' "$$f"; \
-			${ECHO} $$f | ${SED} -e 's|^${STAGEDIR}||' >> ${TMPPLIST}; \
+			${ECHO} $$f | ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}; \
 		done \
 	fi) || :
 
@@ -312,6 +312,15 @@
 	@[ -d "${STAGEDIR}${SITE_MAN3}" ] && \
 		${FIND} ${STAGEDIR}${SITE_MAN3} -name '*::README.3' -delete || :
 
+.if ${_USE_PERL5:Mautoplist}
+_USES_install+=	861:perl5-autoplist
+perl5-autoplist:
+	@${FIND} -ds ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} -type f -print | \
+		${GREP} -v '\.packlist' | \
+		${SED} -E -e \
+        's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
+.endif # USE_PERL5:Mautoplist
+
 .if !target(do-test) && (!empty(USE_PERL5:Mmodbuild*) || !empty(USE_PERL5:Mconfigure))
 TEST_TARGET?=	test
 TEST_WRKSRC?=	${BUILD_WRKSRC}