diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index 2f95cb4b9f95..135c79adac88 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/09/11 23:59:33 asau Exp $
+# $NetBSD: Makefile,v 1.28 2013/10/18 11:41:17 bsiegert Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -30,6 +30,7 @@ post-extract:
 	${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${FHOME}
 	cd ${WRKSRC} && pax -rw * ${DESTDIR}${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/en1 ${DESTDIR}${MBROLA}
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index fb7180a6969c..2345fe642869 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/09/11 23:59:36 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/10/18 11:41:17 bsiegert Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -30,6 +30,7 @@ post-extract:
 	${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${FHOME}
 	cd ${WRKSRC} && pax -rw * ${DESTDIR}${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/us1 ${DESTDIR}${MBROLA}
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index ecd04cb25002..367687f48152 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/09/11 23:59:36 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/10/18 11:41:17 bsiegert Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -30,6 +30,7 @@ post-extract:
 	${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${FHOME}
 	cd ${WRKSRC} && pax -rw * ${DESTDIR}${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/us2 ${DESTDIR}${MBROLA}
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 7e6a0c6a61ae..298267413cf9 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/09/11 23:59:36 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/10/18 11:41:17 bsiegert Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -30,6 +30,7 @@ post-extract:
 	${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${FHOME}
 	cd ${WRKSRC} && pax -rw * ${DESTDIR}${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/us3 ${DESTDIR}${MBROLA}
diff --git a/databases/phpldapadmin/Makefile b/databases/phpldapadmin/Makefile
index acaf2a375330..37c4ec02ea45 100644
--- a/databases/phpldapadmin/Makefile
+++ b/databases/phpldapadmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/04/02 16:00:10 taca Exp $
+# $NetBSD: Makefile,v 1.37 2013/10/18 11:41:17 bsiegert Exp $
 
 DISTNAME=	phpldapadmin-${VERSION}
 CATEGORIES=	databases www
@@ -48,6 +48,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/index.php \
 		${DESTDIR}${PREFIX}/share/phpldapadmin
 .for i in ${PAX_DIRS}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/phpldapadmin/${i:Q}
 	cd ${WRKSRC}/${i:Q} && ${FIND} . -type f \! -name '*.orig' -print | \
 		 pax -rwppm  ${DESTDIR}${PREFIX}/share/phpldapadmin/${i:Q}
 .endfor
diff --git a/devel/RTFM/Makefile b/devel/RTFM/Makefile
index 1aedfe8f2aea..837aed7f260b 100644
--- a/devel/RTFM/Makefile
+++ b/devel/RTFM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/31 11:16:31 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/10/18 11:41:17 bsiegert Exp $
 #
 
 DISTNAME=	RTFM-2.4.5
@@ -25,7 +25,7 @@ INSTALLATION_DIRS=	lib share
 
 do-install:
 	@${ECHO} "=> Libraries"
-	${INSTALL_DATA_DIR} ${DESTDIR}${RT_LIB_DIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${RT_LIB_DIR}/RT
 	cd ${WRKSRC}/lib/RT && ${FIND} . -type f ! -name '*.orig' 2>/dev/null |		\
 		pax -rw ${DESTDIR}${RT_LIB_DIR}/RT
 	@${ECHO} "=> HTML Documents"
diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index 85f33b3c3186..0a20835e80e0 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/09/26 21:05:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2013/10/18 11:41:18 bsiegert Exp $
 
 GLVER=		3.5.2
 DISTNAME=	gitolite-${GLVER}
@@ -35,7 +35,8 @@ SUBST_SED.perl=		-e 's,/usr/bin/perl,${PERL5},g'
 
 INSTALLATION_DIRS+=	bin lib \
 			share/doc/gitolite \
-			libexec/gitolite
+			libexec/gitolite \
+			${PERL5_INSTALLVENDORARCH}
 
 pre-install:
 	${FIND} ${WRKSRC} -type f \
diff --git a/games/urban/Makefile b/games/urban/Makefile
index 3389113bb861..233adbd71587 100644
--- a/games/urban/Makefile
+++ b/games/urban/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/06 11:54:57 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=	urban-1.5.3
@@ -17,6 +17,8 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=	pax
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 
+INSTALLATION_DIRS=	share/urban
+
 post-install:
 	cd ${WRKDIR} && pax -rwppm snd ${DESTDIR}${PREFIX}/share/urban
 
diff --git a/geography/xrmap-anthems/Makefile b/geography/xrmap-anthems/Makefile
index fa3e2e8a601c..74fa5e6c4552 100644
--- a/geography/xrmap-anthems/Makefile
+++ b/geography/xrmap-anthems/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/08/10 12:45:15 shattered Exp $
+# $NetBSD: Makefile,v 1.11 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=		anthems-1.3
@@ -14,7 +14,7 @@ COMMENT=		National anthems (text) for xrmap
 DEPENDS+=		xrmap-base>=2.29:../../geography/xrmap-base
 
 NO_BUILD=		yes
-INSTALLATION_DIRS=	share/rmap
+INSTALLATION_DIRS=	share/rmap/anthems
 USE_TOOLS+=		pax
 
 do-install:
diff --git a/lang/erlang-doc/Makefile b/lang/erlang-doc/Makefile
index 75dc346d1773..b4bf8a936161 100644
--- a/lang/erlang-doc/Makefile
+++ b/lang/erlang-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/02 20:11:39 asau Exp $
+# $NetBSD: Makefile,v 1.11 2013/10/18 11:41:18 bsiegert Exp $
 
 DISTNAME=		otp_doc_html_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
 PKGNAME=		erlang-doc-${ERLANG_VERSION}
@@ -24,6 +24,8 @@ DUPLICATE_FILES=	lib/cosEvent-${VERSION.cosEvent}/info
 DUPLICATE_FILES+=	lib/cosEventDomain-${VERSION.cosEventDomain}/info
 DUPLICATE_FILES+=	lib/mnesia_session-${VERSION.mnesia_session}/info
 
+INSTALLATION_DIRS=	lib/erlang
+
 do-install:
 	cd ${WRKDIR} && pax ${DUPLICATE_FILES:=-s,%,,} -rw doc erts-${VERSION.erts} lib ${DESTDIR}${PREFIX}/lib/erlang/
 
diff --git a/lang/erlang-man/Makefile b/lang/erlang-man/Makefile
index 8efd2bdc7dda..41944f7a62d3 100644
--- a/lang/erlang-man/Makefile
+++ b/lang/erlang-man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/02 20:11:39 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/10/18 11:41:18 bsiegert Exp $
 
 DISTNAME=		otp_doc_man_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
 PKGNAME=		erlang-man-${ERLANG_VERSION}
@@ -19,6 +19,8 @@ USE_TOOLS+=		pax
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
+INSTALLATION_DIRS=	lib/erlang
+
 do-install:
 	cd ${WRKDIR} && pax -rw man ${DESTDIR}${PREFIX}/lib/erlang/
 
diff --git a/lang/mit-scheme-bin/Makefile b/lang/mit-scheme-bin/Makefile
index 9516d7fddb97..9ccf61143144 100644
--- a/lang/mit-scheme-bin/Makefile
+++ b/lang/mit-scheme-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/02 20:11:45 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=		mit-scheme-7.7.1-ix86-gnu-linux
@@ -14,7 +14,7 @@ EMUL_PLATFORMS=		linux-i386
 EMUL_MODULES.linux=	base
 
 WRKSRC=			${WRKDIR}
-INSTALLATION_DIRS=	bin libexec
+INSTALLATION_DIRS=	bin lib libexec
 
 USE_TOOLS+=	pax
 
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d24914d8a8f0..10ae93de830c 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2013/10/10 14:42:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.124 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=	# empty
@@ -65,6 +65,7 @@ post-build:
 	  < ${FILESDIR}/desktop.in					\
 	  > ${WRKDIR}/desktop
 
+INSTALLATION_DIRS+=	lib/${MOZILLA}/extensions
 INSTALLATION_DIRS+=	share/applications share/pixmaps
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/desktop				\
diff --git a/mail/thunderbird10/Makefile b/mail/thunderbird10/Makefile
index fadb4b02c40b..1e4dc30e020b 100644
--- a/mail/thunderbird10/Makefile
+++ b/mail/thunderbird10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/10/10 14:42:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=	thunderbird-${TB_VER}esr.source
@@ -59,6 +59,7 @@ post-build:
 	  < ${FILESDIR}/desktop.in					\
 	  > ${WRKDIR}/desktop
 
+INSTALLATION_DIRS+=	lib/${MOZILLA}/extensions
 INSTALLATION_DIRS+=	share/applications share/pixmaps
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/desktop				\
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index c12388776b92..ec34f458df28 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/07/12 10:45:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=		netdisco-1.1_with_mibs
@@ -142,7 +142,7 @@ do-build:
 do-install:
 	${RM} -f ${WRKSRC:Q}/bin/netdisco_daemon
 	cd ${WRKSRC:Q} && pax -rw -pp . ${DESTDIR}${PREFIX:Q}/netdisco
-	mkdir ${DESTDIR}${EGDIR}
+	${MKDIR} ${DESTDIR}${EGDIR}
 
 	set -e; \
 	for i in netdisco.conf netdisco-topology.txt netdisco.crontab \
diff --git a/security/base/Makefile b/security/base/Makefile
index f9ed839ab3cb..9bc300f53c9e 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/05/31 12:41:50 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=	base-1.4.3.1
@@ -82,6 +82,7 @@ do-install:
 .	endfor
 
 .	for i in ${PAX_DIRS}
+		${INSTALL_DATA_DIR} ${DESTDIR}${BASE_DIR}/${i:Q}
 		cd ${WRKSRC}/${i:Q} && pax -rw . ${DESTDIR}${BASE_DIR}/${i:Q}
 .	endfor
 
diff --git a/wm/notion/Makefile b/wm/notion/Makefile
index 4cc01b7fb46b..bc0fad343efd 100644
--- a/wm/notion/Makefile
+++ b/wm/notion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/07/05 14:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2013/10/18 11:41:18 bsiegert Exp $
 
 DISTNAME=	notion-3-2013030200-src
 PKGNAME=	${DISTNAME:S/3-/3./:S/-src//}
@@ -46,6 +46,7 @@ EGFILES+=	lookcommon_clean.lua
 EGFILES+=	lookcommon_emboss.lua
 
 PKG_SYSCONFSUBDIR=	notion
+INSTALLATION_DIRS=	${EGDIR}
 
 .for f in ${EGFILES}
 CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
diff --git a/www/contao211-translations/Makefile b/www/contao211-translations/Makefile
index f9aaf0f59aa3..dd5befdfee11 100644
--- a/www/contao211-translations/Makefile
+++ b/www/contao211-translations/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/08/30 15:46:25 taca Exp $
+# $NetBSD: Makefile,v 1.31 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=	contao${CT_VER}-translations-${VERS}
@@ -34,6 +34,7 @@ pre-install:
 	${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \;
 
 do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${CT_WEBDIR}
 	cd ${WRKSRC}; pax -rw . ${DESTDIR}${PREFIX}/${CT_WEBDIR}
 	${SED} -e 1q PLIST.master > ${PLIST_SRC}
 	for lang in ${CT_LANGUAGES}; do \
diff --git a/www/ies4linux/Makefile b/www/ies4linux/Makefile
index 8905f79c01ba..3c46ffbd0b02 100644
--- a/www/ies4linux/Makefile
+++ b/www/ies4linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/28 06:30:18 asau Exp $
+# $NetBSD: Makefile,v 1.11 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=	ies4linux-2.99.0.1
@@ -29,7 +29,7 @@ SUBST_SED.sharedir=	-e "s|.dirname ..0..|${PREFIX}/${SHAREDIR}|g"
 REPLACE_BASH=		${WRKSRC}/ies4linux \
 			${WRKSRC}/lib/install.sh ${WRKSRC}/lib/uninstall.sh
 
-INSTALLATION_DIRS	= bin ${SHAREDIR}
+INSTALLATION_DIRS= 	bin ${SHAREDIR}
 
 do-install:
 	cd ${WRKSRC} && rm -f lib/functions.sh.orig
diff --git a/www/phraseanet/Makefile b/www/phraseanet/Makefile
index caf69207d83f..f6d56b178116 100644
--- a/www/phraseanet/Makefile
+++ b/www/phraseanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/05/31 12:42:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 .include "../../www/phraseanet/Makefile.common"
@@ -35,7 +35,7 @@ APACHE_USER?=		www
 APACHE_GROUP?=		www
 APACHE_DIRS_PERMS=	${APACHE_USER} ${APACHE_GROUP} 0755
 
-INSTALLATION_DIRS+=	share/examples/phraseanet
+INSTALLATION_DIRS+=	share/examples/phraseanet ${PHRASEANETDIR}
 CONF_FILES=	${DESTDIR}${PREFIX}/share/examples/phraseanet/phrasea.conf \
 		${PKG_SYSCONFDIR}/phrasea.conf
 
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 5618daaecedf..7bb545b41608 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2013/10/10 14:42:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.107 2013/10/18 11:41:18 bsiegert Exp $
 #
 
 DISTNAME=	# empty
@@ -81,6 +81,7 @@ post-install:
 	  cd "${WRKDIR}/extensions/$$subdir" &&				\
 	  ${UNZIP_CMD} -aqo $$e;					\
 	done
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/seamonkey/extensions
 	cd ${WRKDIR}/extensions && pax -rw .				\
 	   ${DESTDIR}${PREFIX}/lib/seamonkey/extensions/.
 	rm -rf ${WRKDIR}/extensions