diff --git a/xbps-src b/xbps-src
index 20f8814d345..c76d079a524 100755
--- a/xbps-src
+++ b/xbps-src
@@ -257,8 +257,10 @@ check_build_requirements() {
 
 install_bbootstrap() {
     [ -n "$CHROOT_READY" ] && return
-    if [ -n "$1" -o -n "$XBPS_SKIP_REMOTEREPOS" ]; then
-        unset XBPS_TARGET_PKG
+    if [ -n "$1" ]; then
+        unset XBPS_TARGET_PKG XBPS_INSTALL_ARGS
+    fi
+    if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
         unset XBPS_INSTALL_ARGS
     fi
     # binary bootstrap