diff --git a/main/acct/APKBUILD b/main/acct/APKBUILD
index 10a73501604161b2717e76221c528bec82817e4e..2b7d1bf03bbc3823813bba6c14e2f196e014e472 100644
--- a/main/acct/APKBUILD
+++ b/main/acct/APKBUILD
@@ -16,6 +16,7 @@ builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	default_prepare
+	update_config_sub
 	sed -i -e '/gets is a/d' \
 		"$builddir"/lib/stdio.in.h
 }
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 76612044f1fe7cc43b5201377bb5d71d02c317bc..80bf0cd21ad95b47c83f947f36504a40b01f7b76 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -16,6 +16,10 @@ source="https://ftp.gnu.org/gnu/aspell/aspell-$pkgver.tar.gz"
 # secfixes:
 #   0.60.8-r0:
 #     - CVE-2019-17544
+prepare() {
+	default_prepare
+	update_config_sub
+}
 
 build() {
 	cd "$builddir"
diff --git a/main/atf/APKBUILD b/main/atf/APKBUILD
index ee6d71c3e9d5ffd33d93b12ae8c3fa2e770fde34..f0d90dd3e52330c832526932777d2f196964b7e5 100644
--- a/main/atf/APKBUILD
+++ b/main/atf/APKBUILD
@@ -10,6 +10,11 @@ license="BSD-2-Clause AND BSD-3-Clause"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://github.com/jmmv/atf/releases/download/atf-$pkgver/atf-$pkgver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 2caf670ba7d9f3077e8d84a76ced8a5664a5412e..8054b0e351ef0a5f0b83b3ccb9429050b8bd668c 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -119,6 +119,7 @@ prepare() {
 			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
 			"$i"
 	done
+	update_config_sub
 }
 
 build() {
diff --git a/main/chrpath/APKBUILD b/main/chrpath/APKBUILD
index 023e26e180ee4d4465a09173a4e214793b89bbc0..f2bc440be44d101227219f3d186c04fa91252851 100644
--- a/main/chrpath/APKBUILD
+++ b/main/chrpath/APKBUILD
@@ -9,6 +9,11 @@ license="GPL-2.0-or-later"
 subpackages="$pkgname-doc"
 source="https://alioth-archive.debian.org/releases/chrpath/chrpath/$pkgver/chrpath-$pkgver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	cd "$builddir"
 	./configure \
diff --git a/main/cunit/APKBUILD b/main/cunit/APKBUILD
index ef44d83068d630f1441299f30b38d8f776dad667..ae369ebcb6284800a14e807d731913d143ddb5d8 100644
--- a/main/cunit/APKBUILD
+++ b/main/cunit/APKBUILD
@@ -24,6 +24,7 @@ prepare() {
 	automake --add-missing --include-deps --copy
 	autoconf
 	sed -i "s/@VERSION@-@RELEASE@/$pkgver/" cunit.pc.in
+	update_config_sub
 }
 
 build() {
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index de6d9e6f30beaeeceefb071e72fdd67930be1a41..4fa04209912b8b684506e1ea5d41074b9adbbdc9 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -32,6 +32,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v$
 #   2.2.10-r0:
 #     - CVE-2018-4700
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 736011a6de72e0fc21241cadad39786b0acc4eb0..455967c60ac339c0150c502e793dd0b8946fa768 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -87,9 +87,12 @@ prepare() {
 	# unpacked and patched.
 	tar -C "$builddir"/bind/ -xzf "$builddir"/bind/bind.tar.gz
 	default_prepare
+	update_config_guess
+	update_config_sub
 }
 
 build() {
+	cp config.guess config.sub bind/bind-*/
 	cp -a "$builddir" "$builddir-ldap"
 
 	_configure
diff --git a/main/flite/APKBUILD b/main/flite/APKBUILD
index 9fd2db2299b9489d140c028d12caad17800520b9..27a2178e210d2536eba32eb9f701e1f122b9cb30 100644
--- a/main/flite/APKBUILD
+++ b/main/flite/APKBUILD
@@ -16,6 +16,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/festvox/flite/archive/v$pkgv
 prepare() {
 	default_prepare
 	sed -e "s|@PKGVER@|$pkgver|" -i "$srcdir"/flite.pc
+	update_config_sub
 }
 
 build() {
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index 82536b13d76f8c8841eec6b5e8d83975f045082a..9a7c7484e0b1d5fcc91e48fb24937a93389b189e 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -10,6 +10,11 @@ license="GPL-3.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://ftp.gnu.org/gnu/gdbm/gdbm-$pkgver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	# we disable large-file due to it makes the db file non-compat
 	# with gdbm-1.8.3
diff --git a/main/ghostscript/APKBUILD b/main/ghostscript/APKBUILD
index 1c3a25b5575ac62e4bcf77c4d8c57e70e484e9fa..e28d935649a2284176147d1bc3c48a89157600d1 100644
--- a/main/ghostscript/APKBUILD
+++ b/main/ghostscript/APKBUILD
@@ -98,6 +98,7 @@ prepare() {
 
 	cd $builddir/ijs
 	libtoolize --force && aclocal && autoconf && automake --add-missing
+	update_config_sub
 }
 
 build() {
diff --git a/main/iperf/APKBUILD b/main/iperf/APKBUILD
index d19fdc7326b29e7908957c3aec2fb7c6c06ce7c4..23822dc29b4214d5fa54c3caf928e1750368abdb 100644
--- a/main/iperf/APKBUILD
+++ b/main/iperf/APKBUILD
@@ -21,7 +21,6 @@ prepare() {
 	default_prepare
 }
 
-
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/iperf3/APKBUILD b/main/iperf3/APKBUILD
index 6dc77537c08c426fab46a4c0f6bef1e06415bc6f..d59d415d9168c8dd434f30675725bb4a0a75b0b3 100644
--- a/main/iperf3/APKBUILD
+++ b/main/iperf3/APKBUILD
@@ -19,6 +19,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/esnet/$_pkgname/archive/$pkg
 	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	./configure \
diff --git a/main/isl/APKBUILD b/main/isl/APKBUILD
index ebff80b38b1cfd453ad232ab8968e70c5c4e1387..12817e756c9423ff9f8e4385f1371f68af7e66e9 100644
--- a/main/isl/APKBUILD
+++ b/main/isl/APKBUILD
@@ -16,6 +16,11 @@ source="http://isl.gforge.inria.fr/isl-$pkgver.tar.bz2"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/isl22/APKBUILD b/main/isl22/APKBUILD
index 31ffbb3cf946d72d6519797eef089ffe6566e698..889025f8da0f4612dbd45a75a047b46b57850013 100644
--- a/main/isl22/APKBUILD
+++ b/main/isl22/APKBUILD
@@ -21,6 +21,11 @@ source="http://isl.gforge.inria.fr/isl-$pkgver.tar.bz2"
 
 builddir="$srcdir"/isl-$pkgver
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/joe/APKBUILD b/main/joe/APKBUILD
index 62789a7eed979ee996349d2947a1108bc98cae07..14959329f07ad24c95e14cbe99a6b5af315f89f7 100644
--- a/main/joe/APKBUILD
+++ b/main/joe/APKBUILD
@@ -14,6 +14,11 @@ source="https://downloads.sourceforge.net/project/joe-editor/JOE%20sources/$pkgn
 
 builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	cd "$builddir"
 	./configure \
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index 7857e9c93a25f3d6d546f0f363a02502b81e4af5..0fe95769b1c2a0e6edc90dc176fab2ed80ee5fbb 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -16,6 +16,11 @@ source="https://lftp.yar.ru/ftp/lftp-$pkgver.tar.xz"
 #   4.8.4-r0:
 #     - CVE-2018-10916
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/libatomic_ops/APKBUILD b/main/libatomic_ops/APKBUILD
index 251112b718cb373043f96c9cb44de4e83fea1a03..c1ab2501a043f4ca5eb78c357370662fd47d3781 100644
--- a/main/libatomic_ops/APKBUILD
+++ b/main/libatomic_ops/APKBUILD
@@ -14,6 +14,11 @@ case "$CARCH" in
 	s390x) options="!check" ;; # FIXME https://github.com/ivmai/libatomic_ops/issues/44
 esac
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/libburn/APKBUILD b/main/libburn/APKBUILD
index 34d33346bdda4bdc6114507e2c82465b4e13c46f..8f7bdf2b52a39e3b690446cd5ed38b1929210bce 100644
--- a/main/libburn/APKBUILD
+++ b/main/libburn/APKBUILD
@@ -14,6 +14,11 @@ makedepends="linux-headers"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://files.libburnia-project.org/releases/libburn-${_ver}$_pver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/libisoburn/APKBUILD b/main/libisoburn/APKBUILD
index b8e31c0a69133bc090a261a44f6824e52276f510..252e3a2876636ab26f0ef310838cb54b35306c59 100644
--- a/main/libisoburn/APKBUILD
+++ b/main/libisoburn/APKBUILD
@@ -11,6 +11,11 @@ makedepends="libburn-dev libisofs-dev acl-dev zlib-dev
 subpackages="$pkgname-dev $pkgname-doc xorriso:_xorriso"
 source="http://files.libburnia-project.org/releases/libisoburn-$pkgver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/libisofs/APKBUILD b/main/libisofs/APKBUILD
index 827061b9a39e28d47d89de68ccb2c337fb4640ac..027a7663eee020d29e574b4c31163c5adb1a4533 100644
--- a/main/libisofs/APKBUILD
+++ b/main/libisofs/APKBUILD
@@ -10,6 +10,11 @@ makedepends="acl-dev zlib-dev"
 subpackages="$pkgname-dev"
 source="http://files.libburnia-project.org/releases/libisofs-$pkgver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/libmnl/APKBUILD b/main/libmnl/APKBUILD
index 8ca1595e2fd837b0f7b7d64d5a3bce04156dea54..32e9411dc41314df75621881c371995246de01b0 100644
--- a/main/libmnl/APKBUILD
+++ b/main/libmnl/APKBUILD
@@ -13,6 +13,11 @@ subpackages="$pkgname-static $pkgname-dev"
 source="https://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
 	musl-fix-headers.patch"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/libshout/APKBUILD b/main/libshout/APKBUILD
index 4a8f137f33672ce79655ad8cf61f98596c8592b7..1be0e499bc21eddee27e637df46e94111338c74f 100644
--- a/main/libshout/APKBUILD
+++ b/main/libshout/APKBUILD
@@ -11,6 +11,11 @@ makedepends="speex-dev libtheora-dev libvorbis-dev openssl-dev"
 subpackages="$pkgname-static $pkgname-doc $pkgname-dev"
 source="http://downloads.xiph.org/releases/libshout/libshout-$pkgver.tar.gz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD
index b75c35d14d9a6d4d13892add0cd83c042e70435b..02af7eca88f7c2eb14293ba49d661a7752ef966e 100644
--- a/main/libtool/APKBUILD
+++ b/main/libtool/APKBUILD
@@ -20,6 +20,11 @@ options="libtool !check"
 
 builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	cd "$builddir"
 	./configure \
diff --git a/main/libusb-compat/APKBUILD b/main/libusb-compat/APKBUILD
index c800b9747f5d00bacdf95dd8b33036fea6a4a8ff..f535c426419da4c4cc8eb09118958baab1780bdd 100644
--- a/main/libusb-compat/APKBUILD
+++ b/main/libusb-compat/APKBUILD
@@ -13,6 +13,11 @@ makedepends="libusb-dev"
 source="https://downloads.sourceforge.net/libusb/$pkgname-$pkgver.tar.bz2
 	fix-headers.patch"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	cd "$builddir"
 	./configure \
diff --git a/main/libxrender/APKBUILD b/main/libxrender/APKBUILD
index c507f87292945c5aca18dad8554c8033172abc2f..82e918afb0e14c0fd9b9b812c57fd0000d9d0f40 100644
--- a/main/libxrender/APKBUILD
+++ b/main/libxrender/APKBUILD
@@ -12,6 +12,11 @@ depends=
 makedepends="xorgproto libx11-dev util-macros"
 source="https://www.x.org/releases/individual/lib/libXrender-$pkgver.tar.bz2"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 builddir="$srcdir"/libXrender-$pkgver
 build() {
 	cd "$builddir"
diff --git a/main/libxtst/APKBUILD b/main/libxtst/APKBUILD
index e5a04b6c34b5bdd672875d15c55fc5a9c4aff097..5402a51334380f0ed60e7d24d27da6a53de4ab36 100644
--- a/main/libxtst/APKBUILD
+++ b/main/libxtst/APKBUILD
@@ -12,6 +12,11 @@ makedepends="xorgproto libx11-dev libxext-dev libxi-dev util-macros"
 source="https://www.x.org/releases/individual/lib/libXtst-$pkgver.tar.bz2
 	"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 builddir="$srcdir"/libXtst-$pkgver
 build() {
 	cd "$builddir"
diff --git a/main/libxv/APKBUILD b/main/libxv/APKBUILD
index 4662e86d8cc14cfe1dd2c1ac8bae9dda5cfc1686..0310484ba0d57829957eef93e35c491f0012d5b5 100644
--- a/main/libxv/APKBUILD
+++ b/main/libxv/APKBUILD
@@ -12,6 +12,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://www.x.org/releases/individual/lib/libXv-$pkgver.tar.bz2
 	"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 builddir="$srcdir"/libXv-$pkgver
 build() {
 	cd "$builddir"
diff --git a/main/libxxf86vm/APKBUILD b/main/libxxf86vm/APKBUILD
index 9dc57952bbf046cc308cc61300b8af30a54de381..c73b4b5a0295e9054d3aac11426b424406cc10fe 100644
--- a/main/libxxf86vm/APKBUILD
+++ b/main/libxxf86vm/APKBUILD
@@ -15,6 +15,11 @@ source="https://www.x.org/releases/individual/lib/libXxf86vm-$pkgver.tar.bz2
 
 builddir="$srcdir"/libXxf86vm-$pkgver
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	cd "$builddir"
 	./configure \
diff --git a/main/lttng-ust/APKBUILD b/main/lttng-ust/APKBUILD
index c03f6e8f9bf504f04a5e86d73454f32b2b6845be..a5517758da31ad33ab8912e66db1a29def610674 100644
--- a/main/lttng-ust/APKBUILD
+++ b/main/lttng-ust/APKBUILD
@@ -12,6 +12,11 @@ checkdepends="bash"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-tools::noarch py3-lttng:pyagent"
 source="https://lttng.org/files/lttng-ust/lttng-ust-$pkgver.tar.bz2"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 6c78d0cd5883d78ee326207933e4bfccf4b7389f..b1125309f808de0a2d76066214d4df391a1a3933 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -41,6 +41,11 @@ subpackages="
 
 builddir="$srcdir/LVM2.$pkgver"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	# during cross-compilation malloc test goes wrong
 	export ac_cv_func_malloc_0_nonnull=yes
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index 0a12cc3f6485e85ee33001b6118572732de13722..889eedc053ad96c32ff937e0d385616f02fb1bf8 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -22,6 +22,11 @@ source="https://nmap.org/dist/nmap-$pkgver.tar.bz2
 #     - CVE-2017-18594
 #     - CVE-2018-15173
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/ntfs-3g/APKBUILD b/main/ntfs-3g/APKBUILD
index 4babd6b7acc4cb5cd85768d925238866fe00a9d7..027e2cf6557d545d63a21ed869949903bf1f5f06 100644
--- a/main/ntfs-3g/APKBUILD
+++ b/main/ntfs-3g/APKBUILD
@@ -21,6 +21,11 @@ builddir="$srcdir/$_pkgreal-$pkgver"
 #   2017.3.23-r2:
 #     - CVE-2019-9755
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/pkgconf/APKBUILD b/main/pkgconf/APKBUILD
index 4f39b28d4e3911d540473356c6733ebabf3d7524..b4d9ae55e06a9d7abab13119f47d21da9c773b60 100644
--- a/main/pkgconf/APKBUILD
+++ b/main/pkgconf/APKBUILD
@@ -12,6 +12,11 @@ subpackages="$pkgname-doc $pkgname-dev"
 source="https://distfiles.dereferenced.org/pkgconf/pkgconf-$pkgver.tar.xz"
 checkdepends="kyua atf"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/rtpproxy/APKBUILD b/main/rtpproxy/APKBUILD
index e31fad96d7842a0d2df5bc2f04c486c4557f8e54..03f0a696018bdd1215a18cf280749b6abaef58a9 100644
--- a/main/rtpproxy/APKBUILD
+++ b/main/rtpproxy/APKBUILD
@@ -18,6 +18,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sippy/rtpproxy/archive/v$pkg
 	rtpproxy.confd
 	rtpproxy.initd"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/sharutils/APKBUILD b/main/sharutils/APKBUILD
index deb8b52a9afeb85c243e325a40339160f3d1ecc4..0418024c3a44041354ad095db98a184d5a5933ca 100644
--- a/main/sharutils/APKBUILD
+++ b/main/sharutils/APKBUILD
@@ -15,6 +15,11 @@ source="https://ftp.gnu.org/gnu/sharutils/sharutils-$pkgver.tar.xz
 	gcc-10.patch
 	"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/snort/APKBUILD b/main/snort/APKBUILD
index 3e671b535a97a11c25866989aa4aab8a42e594de..1f80f28aa50095bf8fcbb11fa391eab97f45f1fd 100644
--- a/main/snort/APKBUILD
+++ b/main/snort/APKBUILD
@@ -31,6 +31,7 @@ prepare() {
 	# correct paths in default config file
 	sed -i -e 's|/usr/local|/usr|' etc/snort.conf
 	sed -i -e 's|\.\./|/var/lib/snort/|' etc/snort.conf
+	update_config_sub
 }
 
 build() {
diff --git a/main/sqsh/APKBUILD b/main/sqsh/APKBUILD
index 9416b274a38bae29c844e647522ce616d6e4bff7..34f329067be55d9bd63c92ba677f17902a274b78 100644
--- a/main/sqsh/APKBUILD
+++ b/main/sqsh/APKBUILD
@@ -18,6 +18,12 @@ source="https://downloads.sourceforge.net/project/sqsh/sqsh/sqsh-$_v/sqsh-$pkgve
 	tds-version.patch
 	freetds-1.2.patch
 	"
+
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 builddir="$srcdir"/$pkgname-$_v
 build() {
 	SYBASE=/usr
diff --git a/main/tcl-tls/APKBUILD b/main/tcl-tls/APKBUILD
index 397c4290729817e8bc95de080424aad686fcdf06..1bfb9586014f4578bfd789ea78655abcedb9ae48 100644
--- a/main/tcl-tls/APKBUILD
+++ b/main/tcl-tls/APKBUILD
@@ -12,6 +12,11 @@ source="https://core.tcl.tk/tcltls/uv/tcltls-$pkgver.tar.gz"
 
 builddir="$srcdir/tcltls-$pkgver"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index 57e5ec930cf60bc68b326c3b658ed3ad39eecba5..a811dce8aa6b0b6172a12a1a8dd21d0e2b49c17a 100644
--- a/main/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
@@ -14,6 +14,11 @@ source="http://www.unixodbc.org/unixODBC-$pkgver.tar.gz"
 
 builddir="$srcdir/unixODBC-$pkgver"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	cd "$builddir"
 	./configure \
diff --git a/main/userspace-rcu/APKBUILD b/main/userspace-rcu/APKBUILD
index 29e1d1798270297030a260a56dd08fc78e64e539..6dbd9be6fdee192f43dc4fae4f9e59925937e320 100644
--- a/main/userspace-rcu/APKBUILD
+++ b/main/userspace-rcu/APKBUILD
@@ -12,6 +12,11 @@ makedepends="bash perl perl-utils"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://lttng.org/files/urcu/userspace-rcu-$pkgver.tar.bz2"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \
diff --git a/main/vanessa_socket/APKBUILD b/main/vanessa_socket/APKBUILD
index d701a2dde5883123b1f3d735681814e9e1216317..79eba18554d1c62524666b1699e08ac85e90fb07 100644
--- a/main/vanessa_socket/APKBUILD
+++ b/main/vanessa_socket/APKBUILD
@@ -14,6 +14,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="http://horms.net/projects/vanessa/download/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
 builddir="$srcdir"/$pkgname-$pkgver
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	export LDFLAGS="$LDFLAGS -lvanessa_logger"
 	cd "$builddir"
diff --git a/main/xcb-util/APKBUILD b/main/xcb-util/APKBUILD
index 70d765d33f4973e818e31088f859fa134d9dc6c7..4f7ed898c61914ed702d1ea5d856d42a8552224b 100644
--- a/main/xcb-util/APKBUILD
+++ b/main/xcb-util/APKBUILD
@@ -12,6 +12,11 @@ checkdepends="check-dev"
 subpackages="$pkgname-dev"
 source="https://xcb.freedesktop.org/dist/xcb-util-$pkgver.tar.bz2"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \