diff --git a/common/chroot-style/uchroot.sh b/common/chroot-style/uchroot.sh
index 395f9a64903..237db4ce9f1 100755
--- a/common/chroot-style/uchroot.sh
+++ b/common/chroot-style/uchroot.sh
@@ -2,10 +2,13 @@
 #
 # This chroot script uses xbps-uchroot(8).
 #
+if [ -n "$XBPS_TEMP_MASTERDIR" ]; then
+	ARGS="-O"
+fi
 readonly MASTERDIR="$1"
 readonly DISTDIR="$2"
 readonly HOSTDIR="$3"
-readonly EXTRA_ARGS="$4"
+readonly EXTRA_ARGS="$ARGS $4"
 readonly CMD="$5"
 shift 5
 
diff --git a/xbps-src b/xbps-src
index c273448a453..246938dbde7 100755
--- a/xbps-src
+++ b/xbps-src
@@ -570,15 +570,6 @@ for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
     unset val
 done
 
-# A temporary masterdir requires xbps-uchroot(8) and -O to use overlayfs
-# on tmpfs (available with xbps-0.45).
-if [ -z "$IN_CHROOT" -a -n "$XBPS_TEMP_MASTERDIR" ]; then
-    if [ "$XBPS_CHROOT_CMD" != "uchroot" ]; then
-        echo "ERROR: -t requires XBPS_CHROOT_CMD=uchroot, exiting..."
-        exit 1
-    fi
-    export XBPS_CHROOT_CMD_ARGS="-O"
-fi
 #
 # Sanitize PATH.
 #