diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index 97b8a9be81f..11b2414ba41 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -1,9 +1,10 @@
 # Template file for 'chroot-bash'
 pkgname=chroot-bash
-_bash_distver=5.0
-_bash_patchlevel=016
-version="${_bash_distver}.${_bash_patchlevel}"
+version=5.0.016
 revision=1
+_bash_distver=${version%.*}
+_bash_patchlevel=${version##*.}
+_patchprefix="bash${_bash_distver/./}"
 wrksrc="bash-${_bash_distver}"
 build_style=gnu-configure
 # need 'bash_cv_termcap_lib=gnutermcap' in order to force bash to use the
@@ -15,18 +16,43 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
-checksum=b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
+
+_url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
+for _p in $(seq -w 001 ${_bash_patchlevel}); do
+	distfiles+=" ${_url}/${_patchprefix}-${_p}"
+	skip_extraction+=" ${_patchprefix}-${_p}"
+done
+unset _url
+unset _p
+
+checksum="b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d
+ f2fe9e1f0faddf14ab9bfa88d450a75e5d028fedafad23b88716bd657c737289
+ 87e87d3542e598799adb3e7e01c8165bc743e136a400ed0de015845f7ff68707
+ 4eebcdc37b13793a232c5f2f498a5fcbf7da0ecb3da2059391c096db620ec85b
+ 14447ad832add8ecfafdce5384badd933697b559c4688d6b9e3d36ff36c62f08
+ 5bf54dd9bd2c211d2bfb34a49e2c741f2ed5e338767e9ce9f4d41254bf9f8276
+ d68529a6ff201b6ff5915318ab12fc16b8a0ebb77fda3308303fcc1e13398420
+ 17b41e7ee3673d8887dd25992417a398677533ab8827938aa41fad70df19af9b
+ eec64588622a82a5029b2776e218a75a3640bef4953f09d6ee1f4199670ad7e3
+ ed3ca21767303fc3de93934aa524c2e920787c506b601cc40a4897d4b094d903
+ d6fbc325f0b5dc54ddbe8ee43020bced8bd589ddffea59d128db14b2e52a8a11
+ 2c4de332b91eaf797abbbd6c79709690b5cbd48b12e8dfe748096dbd7bf474ea
+ 2943ee19688018296f2a04dbfe30b7138b889700efa8ff1c0524af271e0ee233
+ f5d7178d8da30799e01b83a0802018d913d6aa972dd2ddad3b927f3f3eb7099a
+ 5d6eee6514ee6e22a87bba8d22be0a8621a0ae119246f1c5a9a35db1f72af589
+ a517df2dda93b26d5cbf00effefea93e3a4ccd6652f152f4109170544ebfa05e
+ ffd1d7a54a99fa7f5b1825e4f7e95d8c8876bc2ca151f150e751d429c650b06d"
 
 bootstrap=yes
 provides="bash-${version}_${revision}"
-conflicts="bash>=0 dash>=0"
+conflicts="bash>=0 dash>=0 busybox>=0 loksh>=0 mksh>=0 oksh>=0 yash>=0"
 
-pre_configure() {
-	local ver=${_bash_distver//./} p
+post_patch() {
+	local _p
 	cd ${wrksrc}
-	for p in $(seq -w 001 ${_bash_patchlevel}); do
-		msg_normal " Applying patch bash${ver}-$p.\n"
-		patch -sNp0 -i ${XBPS_SRCPKGDIR}/bash/files/bash${ver}-${p}
+	for _p in $(seq -w 001 ${_bash_patchlevel}); do
+		msg_normal " Applying patch ${_patchprefix}-${_p}.\n"
+		patch -sNp0 -i ${XBPS_SRCDISTDIR}/chroot-bash-$version/${_patchprefix}-${_p}
 	done
 }