diff --git a/xbps-src b/xbps-src
index fcc7bb988e1..3638d4f292a 100755
--- a/xbps-src
+++ b/xbps-src
@@ -535,7 +535,8 @@ if [ "$XBPS_CHROOT_CMD" = ethereal ]; then
 else
     : "${XBPS_MASTERDIR:=$XBPS_DISTDIR/masterdir-$XBPS_MACHINE}"
     # but use $XBPS_DISTDIR/masterdir if it exists and the new style doesn't
-    if [ ! -d "${XBPS_MASTERDIR}" ] && [ -d "${XBPS_DISTDIR}/masterdir" ]; then
+    if [ ! -d "${XBPS_MASTERDIR}" ] && [ -d "${XBPS_DISTDIR}/masterdir" ] \
+        && [ "$(cat "${XBPS_DISTDIR}"/masterdir/.xbps_chroot_init)" = "$XBPS_MACHINE" ]; then
         XBPS_MASTERDIR="${XBPS_DISTDIR}/masterdir"
     fi
 fi