Index: Mk/bsd.stage.mk
===================================================================
--- Mk/bsd.stage.mk	(revision 333407)
+++ Mk/bsd.stage.mk	(working copy)
@@ -84,7 +84,10 @@
 	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST}
 .endif
 .endfor
+.if defined(INFO_SUBDIR)
+	@${ECHO_CMD} "@unexec ${RMDIR} %D/${INFO_PATH}/${INFO_SUBDIR} 2> /dev/null || true" >> ${TMPPLIST}
 .endif
+.endif
 
 .if !target(makeplist)
 makeplist: stage