diff --git a/xbps-src b/xbps-src
index db6d926328e..96b473f1b30 100755
--- a/xbps-src
+++ b/xbps-src
@@ -257,6 +257,10 @@ check_build_requirements() {
 
 install_bbootstrap() {
     [ -n "$CHROOT_READY" ] && return
+    if [ -n "$1" ]; then
+        unset XBPS_TARGET_PKG
+        unset XBPS_INSTALL_ARGS
+    fi
     # binary bootstrap
     msg_normal "Installing bootstrap from binary package repositories...\n"
     # XBPS_TARGET_PKG == arch
@@ -461,7 +465,7 @@ readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"
 
 readonly XBPS_TARGET="$1"
 if [ -n "$2" ]; then
-    readonly XBPS_TARGET_PKG="${2##*/}"
+    XBPS_TARGET_PKG="${2##*/}"
 fi
 
 # Check if stdout is a tty; if false disable colors.
@@ -575,7 +579,7 @@ case "$XBPS_TARGET" in
         fi
         $XBPS_LIBEXECDIR/build.sh base-chroot base-chroot $XBPS_TARGET || exit 1
         [ -d $XBPS_MASTERDIR ] && rm -rf $XBPS_MASTERDIR
-        install_bbootstrap
+        install_bbootstrap bootstrap
         ;;
     bootstrap-update)
         bootstrap_update