diff --git a/xbps-src b/xbps-src
index bb95db80015..4e15f8e60e2 100755
--- a/xbps-src
+++ b/xbps-src
@@ -282,7 +282,11 @@ install_bbootstrap() {
         msg_error "Failed to install bootstrap packages!\n"
     fi
     # Reconfigure base-files to create dirs/symlinks.
-    XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null
+    if xbps-query -r $XBPS_MASTERDIR base-directories &>/dev/null; then
+        XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-directories &>/dev/null
+    else
+        XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null
+    fi
     msg_normal "Installed bootstrap successfully!\n"
     chroot_prepare $XBPS_TARGET_PKG || msg_error "Failed to initialize chroot!\n"
 }