diff --git a/xbps-src b/xbps-src
index 4f8080dbf3..2127dc8490 100755
--- a/xbps-src
+++ b/xbps-src
@@ -284,7 +284,7 @@ install_bbootstrap() {
     mkdir -p $XBPS_MASTERDIR/var/db/xbps/keys
     cd $XBPS_MASTERDIR
     cp -f $XBPS_COMMONDIR/repo-keys/*.plist $XBPS_MASTERDIR/var/db/xbps/keys
-    ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS:+-S $XBPS_INSTALL_ARGS} -y base-chroot${_subarch}
+    ${_bootstrap_arch} $XBPS_INSTALL_CMD ${XBPS_INSTALL_ARGS:+-S $XBPS_INSTALL_ARGS} -yU base-chroot${_subarch}
     if [ $? -ne 0 ]; then
         msg_error "Failed to install bootstrap packages!\n"
     fi
@@ -602,6 +602,10 @@ if [ -z "$IN_CHROOT" ]; then
     fi
 fi
 
+if [ -n "$IN_CHROOT" ]; then
+    xbps-reconfigure -a &>/dev/null
+fi
+
 #
 # Main switch.
 #