diff --git a/templates/bash/template b/templates/bash/template
index 9cfc7c3117e..376f43e41be 100644
--- a/templates/bash/template
+++ b/templates/bash/template
@@ -30,14 +30,12 @@ long_desc="
  to sixty-four. In addition, most sh scripts can be run by Bash without
  modification."
 
+base_chroot=yes
 essential=yes
 register_shell="/bin/bash"
 
-Add_dependency full	glibc
+Add_dependency run	glibc
 Add_dependency build	ncurses
-Add_dependency build	texinfo
-Add_dependency build	gettext
-Add_dependency build	bison
 Add_dependency run	ncurses-libs
 Add_dependency run	coreutils
 
diff --git a/templates/ncurses/template b/templates/ncurses/template
index 6dd17507b98..05f799fb70d 100644
--- a/templates/ncurses/template
+++ b/templates/ncurses/template
@@ -16,6 +16,7 @@ long_desc="
  ecompiler infocmp, clear, tput, tset, and a termcap conversion tool captoinfo.
  Full manual pages are provided for the library and tools."
 
+base_chroot=yes
 subpackages="base devel libs term"
 Add_dependency run glibc
 Add_dependency run ncurses-libs
diff --git a/templates/xbps-base-chroot/template b/templates/xbps-base-chroot/template
index 105ee260c25..cba46c1a4a2 100644
--- a/templates/xbps-base-chroot/template
+++ b/templates/xbps-base-chroot/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-chroot'
 pkgname=xbps-base-chroot
-version=0.11
+version=0.12
 build_style=meta-template
 short_desc="xbps base packages for the chroot target"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -12,6 +12,7 @@ noarch=yes
 base_chroot=yes
 
 Add_dependency full xbps-base-files
+Add_dependency full bash
 Add_dependency full patch
 Add_dependency full make
 Add_dependency full diffutils
diff --git a/xbps-src/shutils/chroot.sh b/xbps-src/shutils/chroot.sh
index 3e2e641d059..3a257f97c3b 100644
--- a/xbps-src/shutils/chroot.sh
+++ b/xbps-src/shutils/chroot.sh
@@ -87,17 +87,9 @@ ff02::3 ip6-allhosts
 _EOF
 
 	cp -f /etc/resolv.conf $XBPS_MASTERDIR/etc
+	# Create /bin/sh symlink to bash
+	cd $XBPS_MASTERDIR/bin && ln -sf bash sh
 
-	#
-	# Copy host shell, bash is prefered to avoid breakage in
-	# GNU autoconf scripts!
-	#
-	mkdir -p $XBPS_MASTERDIR/bin
-	if [ -x /bin/bash ]; then
-		cp -f /bin/bash $XBPS_MASTERDIR/bin/sh
-	elif [ -x /bin/sh ]; then
-		cp -f /bin/sh $XBPS_MASTERDIR/bin/sh
-	fi
 	touch $XBPS_MASTERDIR/.xbps_perms_done
 
 }
@@ -176,9 +168,9 @@ xbps_chroot_handler()
 	[ "$action" != "configure" -a "$action" != "build" -a \
 	  "$action" != "install" -a "$action" != "chroot" ] && return 1
 
-	mount_chroot_fs
-	install_xbps_utils
 	create_busybox_links
+	install_xbps_utils
+	mount_chroot_fs
 
 	if [ ! -f $XBPS_MASTERDIR/.xbps_perms_done ]; then
 		echo -n "==> Preparing chroot on $XBPS_MASTERDIR... "