diff --git a/common/xbps-src/shutils/cross.sh b/common/xbps-src/shutils/cross.sh
index 4325c5f3021..166d1d326da 100644
--- a/common/xbps-src/shutils/cross.sh
+++ b/common/xbps-src/shutils/cross.sh
@@ -48,7 +48,7 @@ prepare_cross_sysroot() {
     fi
     rm -f $errlog
     # Create top level symlinks in sysroot.
-    XBPS_ARCH=$XBPS_TARGET_ARCH xbps-reconfigure -r $XBPS_CROSS_BASE -f base-directories
+    XBPS_ARCH=$XBPS_TARGET_ARCH xbps-reconfigure -r $XBPS_CROSS_BASE -f base-files
     # Create a sysroot/include symlink just in case.
     ln -s usr/include ${XBPS_CROSS_BASE}/include
 
diff --git a/xbps-src b/xbps-src
index 21b3c586fa1..bb95db80015 100755
--- a/xbps-src
+++ b/xbps-src
@@ -281,8 +281,8 @@ install_bbootstrap() {
     if [ $? -ne 0 ]; then
         msg_error "Failed to install bootstrap packages!\n"
     fi
-    # Reconfigure base-directories.
-    XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-directories &>/dev/null
+    # Reconfigure base-files to create dirs/symlinks.
+    XBPS_ARCH=$XBPS_TARGET_PKG xbps-reconfigure -r $XBPS_MASTERDIR -f base-files &>/dev/null
     msg_normal "Installed bootstrap successfully!\n"
     chroot_prepare $XBPS_TARGET_PKG || msg_error "Failed to initialize chroot!\n"
 }