diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template
index 4ed7a2717b9..806bdfef4ee 100644
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@@ -1,7 +1,8 @@
 # Template file for 'acpid'
 pkgname=acpid
 version=2.0.23
-revision=11
+revision=12
+build_pie=yes
 build_options="systemd"
 build_style=gnu-configure
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index 6be42c453f0..91a809c3051 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,10 +1,12 @@
 # Template build file for 'bash'.
-pkgname=bash
 _bash_distver=4.3
 _bash_patchlevel=033
+
+pkgname=bash
 version=${_bash_distver}.${_bash_patchlevel}
-revision=1
+revision=2
 wrksrc=${pkgname}-${_bash_distver}
+build_pie=yes
 build_style=gnu-configure
 configure_args="--without-bash-malloc --with-curses --with-installed-readline"
 hostmakedepends="bison"
diff --git a/srcpkgs/cpio/template b/srcpkgs/cpio/template
index 4c97a7e27a4..3c321e12601 100644
--- a/srcpkgs/cpio/template
+++ b/srcpkgs/cpio/template
@@ -1,7 +1,8 @@
 # Template file for 'cpio'
 pkgname=cpio
 version=2.11
-revision=6
+revision=7
+build_pie=yes
 build_style=gnu-configure
 configure_args="gl_cv_func_stat_file_slash=yes gl_cv_func_malloc_posix=yes
  gl_cv_func_unlink_works=yes gl_cv_func_unsetenv_work=yes ac_cv_func_unlinkat=yes
diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index 5c44fd9189a..9f2857a5ca1 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -1,7 +1,8 @@
 # Template file for 'dash'
 pkgname=dash
 version=0.5.8
-revision=1
+revision=2
+build_pie=yes
 build_style=gnu-configure
 hostmakedepends="bison"
 register_shell="/bin/sh"
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 14a3af7e476..e15ca6a6a71 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,8 +1,9 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=6.7.1
-revision=3
+revision=4
 lib32disabled=yes
+build_pie=yes
 build_options="systemd"
 build_style=configure
 configure_args="--prefix=/usr --sysconfdir=/etc --rundir=/run"
diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template
index 19c5b277c2c..0a57bcedfc1 100644
--- a/srcpkgs/diffutils/template
+++ b/srcpkgs/diffutils/template
@@ -1,8 +1,9 @@
 # Template file for 'diffutils'
 pkgname=diffutils
 version=3.3
-revision=5
+revision=6
 bootstrap=yes
+build_pie=yes
 build_style=gnu-configure
 conflicts="chroot-diffutils>=0"
 short_desc="The GNU diff utilities"
diff --git a/srcpkgs/dosfstools/template b/srcpkgs/dosfstools/template
index ba8e7dd8490..c83f2fd5ee1 100644
--- a/srcpkgs/dosfstools/template
+++ b/srcpkgs/dosfstools/template
@@ -1,7 +1,8 @@
 # Template file for 'dosfstools'
 pkgname=dosfstools
 version=3.0.27
-revision=1
+revision=2
+build_pie=yes
 build_style=gnu-makefile
 make_install_args="PREFIX=/usr SBINDIR=/usr/sbin"
 short_desc="DOS filesystem tools"
diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index ec791b6655f..0ae1af7d740 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,7 +1,8 @@
 # Template file for 'ethtool'
 pkgname=ethtool
 version=3.18
-revision=1
+revision=2
+build_pie=yes
 build_style=gnu-configure
 short_desc="Utility for controlling network drivers and hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template
index 8f969d2ab7a..439900b027d 100644
--- a/srcpkgs/f2fs-tools/template
+++ b/srcpkgs/f2fs-tools/template
@@ -1,7 +1,8 @@
 # Template file for 'f2fs-tools'
 pkgname=f2fs-tools
 version=1.4.0
-revision=2
+revision=3
+build_pie=yes
 build_style=gnu-configure
 configure_args="--sbindir=/usr/bin --disable-static ac_cv_file__git=yes"
 make_install_args="sbindir=/usr/bin"
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index 5563062628b..5e69fd0b421 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,8 +1,9 @@
 # Template file for 'findutils'
 pkgname=findutils
 version=4.4.2
-revision=10
+revision=11
 bootstrap=yes
+build_pie=yes
 build_style=gnu-configure
 configure_args="--localstatedir=/var/lib/locate gl_cv_func_wcwidth_works=yes
 gl_cv_header_working_fcntl_h=yes am_cv_func_working_getline=yes
@@ -28,7 +29,6 @@ pre_configure() {
 		;;
 	esac
 }
-
 post_install() {
 	# Install the cron daily job.
 	vinstall ${FILESDIR}/updatedb.cron-daily 744 etc/cron.daily updatedb
diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index 97b9a9d6542..4d64d388c99 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -1,7 +1,8 @@
 # Template file for 'gawk'
 pkgname=gawk
 version=4.1.1
-revision=3
+revision=4
+build_pie=yes
 build_style=gnu-configure
 configure_args="--with-readline"
 makedepends="readline-devel>=6.3"
diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template
index d37f394f477..12a71fb9cad 100644
--- a/srcpkgs/grep/template
+++ b/srcpkgs/grep/template
@@ -1,7 +1,8 @@
 # Template build file for 'grep'.
 pkgname=grep
 version=2.21
-revision=1
+revision=2
+build_pie=yes
 build_style=gnu-configure
 makedepends="pcre-devel>=8.30"
 conflicts="chroot-grep>=0"
diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index 0db79952ca3..6af5f8c598a 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -1,8 +1,9 @@
 # Template file for 'gzip'
 pkgname=gzip
 version=1.6
-revision=5
+revision=6
 bootstrap=yes
+build_pie=yes
 build_style=gnu-configure
 configure_args="gl_cv_func_fprintf_posix=yes gl_cv_func_fflush_stdin=yes"
 conflicts="chroot-gzip>=0"
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 77b8fdd55da..b4e0a819e16 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,7 +1,8 @@
 # Template file for 'iproute2'
 pkgname=iproute2
 version=3.19.0
-revision=1
+revision=2
+build_pie=yes
 hostmakedepends="pkg-config perl flex"
 makedepends="libfl-devel db-devel>=5.3 iptables-devel>=1.4.21"
 conf_files="
diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template
index 505a39fbb69..20a96ae3093 100644
--- a/srcpkgs/iw/template
+++ b/srcpkgs/iw/template
@@ -1,7 +1,12 @@
 # Template file for 'iw'
+#
+# Does not seem to respect our $CPPFLAGS in environment, force it via CFLAGS.
+CFLAGS="$XBPS_CPPFLAGS"
+
 pkgname=iw
 version=3.17
-revision=1
+revision=2
+build_pie=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config libnl3-devel"
 makedepends="libnl3-devel"
diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template
index 12c3fd65a38..5bfdeaa2262 100644
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@@ -1,7 +1,8 @@
 # Template file for 'kbd'
 pkgname=kbd
 version=2.0.2
-revision=2
+revision=3
+build_pie=yes
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale"
 hostmakedepends="automake libtool gettext-devel flex pkg-config"
@@ -44,7 +45,6 @@ pre_configure() {
 	$XBPS_FETCH_CMD http://git.alpinelinux.org/cgit/aports/plain/main/kbd/error.h
 	autoreconf -fi
 }
-
 post_install() {
 	# Remove keymaps for sun, amiga and atari.
 	for f in sun amiga atari; do
diff --git a/srcpkgs/less/template b/srcpkgs/less/template
index 88ff792e49e..201f5705185 100644
--- a/srcpkgs/less/template
+++ b/srcpkgs/less/template
@@ -1,7 +1,8 @@
 # Template file for 'less'
 pkgname=less
 version=471
-revision=1
+revision=2
+build_pie=yes
 build_style=gnu-configure
 configure_args="--with-regex=pcre"
 makedepends="ncurses-devel pcre-devel>=8.30"
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 69f4843cb33..780aec61e13 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,8 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.13.2
-revision=6
+revision=7
+build_pie=yes
 build_style=configure
 makedepends="sqlite-devel"
 replaces="groff>=0 man-db>=0"
diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template
index dafd0b3500c..42787259b49 100644
--- a/srcpkgs/nvi/template
+++ b/srcpkgs/nvi/template
@@ -1,8 +1,9 @@
 # Template file for 'nvi'
 pkgname=nvi
 version=1.81.6
-revision=7
+revision=8
 patch_args="-Np1"
+build_pie=yes
 build_style=gnu-configure
 build_wrksrc=dist
 makedepends="ncurses-devel db-devel>=5.3"
@@ -22,7 +23,6 @@ do_configure() {
 pre_build() {
 	sed -i -e '/define.*_PATH_MSGCAT/ s/".*"/"\/usr\/share\/vi\/catalog\/"/' pathnames.h
 }
-
 post_install() {
 	# remove cat pages.
 	rm -rf ${DESTDIR}/usr/share/man/cat1
diff --git a/srcpkgs/openbsd-man/template b/srcpkgs/openbsd-man/template
index 608bbf0e48f..f517ae2862b 100644
--- a/srcpkgs/openbsd-man/template
+++ b/srcpkgs/openbsd-man/template
@@ -2,6 +2,7 @@
 pkgname=openbsd-man
 version=20141228
 revision=1
+build_pie=yes
 build_style=gnu-makefile
 hostmakedepends="git"
 replaces="mdocml>=1.13.2_1<1.13.2_5"
diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template
index c69eee0d03e..4a53a2a8c19 100644
--- a/srcpkgs/procps-ng/template
+++ b/srcpkgs/procps-ng/template
@@ -1,7 +1,8 @@
 # Template file for 'procps-ng'
 pkgname=procps-ng
 version=3.3.10
-revision=2
+revision=3
+build_pie=yes
 build_style=gnu-configure
 configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin
  --libdir=/usr/lib --disable-static --disable-kill $(vopt_with systemd)"
diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template
index f7b9eab013f..7b05f19532e 100644
--- a/srcpkgs/psmisc/template
+++ b/srcpkgs/psmisc/template
@@ -1,7 +1,8 @@
 # Template file for 'psmisc'
 pkgname=psmisc
 version=22.21
-revision=2
+revision=3
+build_pie=yes
 build_style=gnu-configure
 makedepends="ncurses-devel"
 short_desc="Small set of utilities that use the linux proc filesystem"
diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template
index 5a5516030a4..b1c8acf8cc1 100644
--- a/srcpkgs/sed/template
+++ b/srcpkgs/sed/template
@@ -1,8 +1,9 @@
 # Template file for 'sed'
 pkgname=sed
 version=4.2.2
-revision=7
+revision=8
 bootstrap=yes
+build_pie=yes
 build_style=gnu-configure
 configure_args="--enable-acl gl_cv_func_working_acl_get_file=yes"
 makedepends="acl-devel"
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index 8889e81bf38..42c519fb4a9 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,7 +1,8 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.2.1
-revision=6
+revision=7
+build_pie=yes
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/sbin
  --libdir=/usr/lib --enable-shared --disable-static
@@ -46,8 +47,7 @@ do_build() {
 	for f in $(find man -name Makefile); do
 		sed -i 's/groups\.1 / /' $f
 	done
-	# Build PIE binaries by default.
-	make CFLAGS+=" -fPIE" LDFLAGS+=" -pie" ${makejobs}
+	make ${makejobs}
 }
 post_install() {
 	# Install our pam files not the ones supplied with shadow.
diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index 2d0a084c717..a843d380135 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -1,8 +1,9 @@
 # Template build file for 'tar'.
 pkgname=tar
 version=1.28
-revision=3
+revision=4
 bootstrap=yes
+build_pie=yes
 build_style=gnu-configure
 configure_args="gl_cv_struct_dirent_d_ino=yes"
 conflicts="chroot-tar>=0"
diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index 95cd62e5959..95f4ed25636 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -1,7 +1,8 @@
 # Template file for 'traceroute'
 pkgname=traceroute
 version=2.0.21
-revision=2
+revision=3
+build_pie=yes
 short_desc="Traces the route taken by packets over an IPv4/IPv6 network"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -11,9 +12,9 @@ checksum=f7ac93ef30b13a587292b8d6a7e2538a65bc978a3a576eab238c392b884e96e0
 
 do_build() {
 	if [ "$CROSS_BUILD" ]; then
-		make LDFLAGS="-L${wrksrc}/libsupp $LDFLAGS" CFLAGS="$CFLAGS" CROSS=${XBPS_CROSS_TRIPLET}- ${makejobs}
+		make LDFLAGS="-L${wrksrc}/libsupp $LDFLAGS" CFLAGS="$CFLAGS $CPPFLAGS" CROSS=${XBPS_CROSS_TRIPLET}- ${makejobs}
 	else
-		make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
+		make CFLAGS="$CFLAGS $CPPFLAGS" LDFLAGS="$LDFLAGS" ${makejobs}
 	fi
 }
 do_install() {
diff --git a/srcpkgs/which/template b/srcpkgs/which/template
index e7ee977db5e..b1665f94233 100644
--- a/srcpkgs/which/template
+++ b/srcpkgs/which/template
@@ -1,8 +1,9 @@
 # Template file for 'which'
 pkgname=which
 version=2.20
-revision=3
+revision=4
 bootstrap=yes
+build_pie=yes
 build_style=gnu-configure
 short_desc="Displays where a particular program in your path is located"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index a459e5e5848..77cd2aba70e 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
 # Template file for 'wpa_supplicant'
 pkgname=wpa_supplicant
 version=2.3
-revision=7
+revision=8
 build_wrksrc=$pkgname
 short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,6 +10,7 @@ homepage="http://w1.fi/wpa_supplicant/"
 distfiles="http://w1.fi/releases/$pkgname-$version.tar.gz"
 checksum=eaaa5bf3055270e521b2dff64f2d203ec8040f71958b8588269a82c00c9d7b6a
 
+build_pie=yes
 hostmakedepends="pkg-config"
 makedepends="libnl3-devel libressl-devel>=2.1.4 dbus-devel readline-devel>=6.3"
 conf_files="/etc/${pkgname}/${pkgname}.conf"
@@ -21,7 +22,7 @@ pre_build() {
 	sed -i 's, -u, -uq,' dbus/*.service.in
 }
 do_build() {
-	export CFLAGS+=" $(pkg-config --cflags libnl-3.0)"
+	export CFLAGS+=" $(pkg-config --cflags libnl-3.0) $CPPFLAGS"
 	make ${make_build_args} V=1 PREFIX=/usr BINDIR=/usr/bin
 }
 do_install() {