diff --git a/xbps-src/shutils/chroot.sh.in b/xbps-src/shutils/chroot.sh.in
index b192aa5a3d..aaa4d59030 100644
--- a/xbps-src/shutils/chroot.sh.in
+++ b/xbps-src/shutils/chroot.sh.in
@@ -118,16 +118,8 @@ _EOF
 
 prepare_chroot()
 {
-	local f=
+	local f
 
-	if [ -h ${XBPS_MASTERDIR}/tmp ]; then
-		rm -f ${XBPS_MASTERDIR}/tmp
-		mkdir ${XBPS_MASTERDIR}/tmp
-	fi
-	if [ -h ${XBPS_MASTERDIR}/var/run ]; then
-		rm -f ${XBPS_MASTERDIR}/var/run
-		mkdir -p ${XBPS_MASTERDIR}/var/run
-	fi
 	# Create some required files.
 	cp -f /etc/mtab $XBPS_MASTERDIR/etc
 	cp -f /etc/resolv.conf $XBPS_MASTERDIR/etc
@@ -139,6 +131,7 @@ prepare_chroot()
 	for f in run/utmp log/lastlog; do
 		chmod 644 $XBPS_MASTERDIR/var/$f
 	done
+	[ ! -d $XBPS_MASTERDIR/boot ] && mkdir -p $XBPS_MASTERDIR/boot
 
 	cat > $XBPS_MASTERDIR/etc/passwd <<_EOF
 root:x:0:0:root:/root:/bin/bash