diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 85d9401fca..97e4aff57f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -136,7 +136,7 @@ chroot_sync_repos() {
     fi
 
     # Make sure to sync index for remote repositories.
-    $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install -S
+    xbps-uchroot $XBPS_MASTERDIR /usr/sbin/xbps-install -S
     if [ -n "$XBPS_CROSS_BUILD" ]; then
         # Copy host keys to the target rootdir.
         if [ ! -d $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys ]; then
@@ -145,7 +145,7 @@ chroot_sync_repos() {
         cp -a $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
             $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/var/db/xbps/keys
         env XBPS_TARGET_ARCH=$XBPS_TARGET_ARCH \
-            $CHROOT_CMD $XBPS_MASTERDIR /usr/sbin/xbps-install \
+            xbps-uchroot $XBPS_MASTERDIR /usr/sbin/xbps-install \
             -r /usr/$XBPS_CROSS_TRIPLET -S
     fi
 
@@ -186,7 +186,7 @@ chroot_handler() {
     esac
 
     if [ "$action" = "chroot" ]; then
-        $CHROOT_CMD ${_chargs} $XBPS_MASTERDIR /bin/xbps-shell || rv=$?
+        xbps-uchroot ${_chargs} $XBPS_MASTERDIR /bin/xbps-shell || rv=$?
     else
         [ -n "$XBPS_CROSS_BUILD" ] && arg="$arg -a $XBPS_CROSS_BUILD"
         [ -n "$XBPS_KEEP_ALL" ] && arg="$arg -C"
@@ -200,8 +200,8 @@ chroot_handler() {
         [ -n "$XBPS_PKG_OPTIONS" ] && arg="$arg -o $XBPS_PKG_OPTIONS"
 
         action="$arg $action"
-        env -i PATH=/bin:/sbin:/usr/bin:/usr/sbin:$PATH HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \
-            $CHROOT_CMD ${_chargs} $XBPS_MASTERDIR /void-packages/xbps-src $action $pkg || rv=$?
+        env -i PATH=/usr/bin:/usr/sbin:$PATH HOME=/tmp IN_CHROOT=1 LANG=en_US.UTF-8 \
+            xbps-uchroot ${_chargs} $XBPS_MASTERDIR /void-packages/xbps-src $action $pkg || rv=$?
     fi
 
     return $rv
diff --git a/xbps-src b/xbps-src
index a128fa424f..ad96b932e8 100755
--- a/xbps-src
+++ b/xbps-src
@@ -423,8 +423,6 @@ else
     readonly XBPS_BUILDSTYLEDIR=$XBPS_COMMONDIR/build_style
     readonly XBPS_LIBEXECDIR=$XBPS_COMMONDIR/xbps-src/libexec
 fi
-readonly CHROOT_CMD=xbps-uchroot
-
 # XBPS_FETCH_CMD can be overriden
 export XBPS_FETCH_CMD="xbps-uhelper fetch"
 readonly XBPS_DIGEST_CMD="xbps-uhelper digest"
@@ -467,7 +465,7 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     XBPS_CCACHE XBPS_DISTCC XBPS_DISTCC_HOSTS XBPS_SKIP_DEPS \
     XBPS_SKIP_REMOTEREPOS XBPS_CROSS_BUILD XBPS_PKG_OPTIONS \
     XBPS_CONFIG_FILE XBPS_KEEP_ALL XBPS_HOSTDIR XBPS_MASTERDIR \
-    XBPS_SRC_VERSION XBPS_DESTDIR CHROOT_CMD XBPS_MACHINE
+    XBPS_SRC_VERSION XBPS_DESTDIR XBPS_MACHINE
 
 for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
     eval val="\$XBPS_$i"