diff --git a/xbps-src b/xbps-src
index 4ec5efe04d6..29abd3d14d2 100755
--- a/xbps-src
+++ b/xbps-src
@@ -485,13 +485,13 @@ else
     export PATH="$MYPATH"
     if [ -n "$XBPS_CCACHE" ]; then
         CCACHEPATH="/usr/lib/ccache/bin"
-        export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
+        export CCACHE_DIR="$XBPS_HOSTDIR/ccache-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}"
         export PATH="$CCACHEPATH:$PATH"
         mkdir -p $CCACHE_DIR
     fi
     if [ -n "$XBPS_DISTCC" ]; then
         DISTCCPATH="/usr/lib/distcc/bin"
-        export DISTCC_DIR="$XBPS_HOSTDIR/distcc"
+        export DISTCC_DIR="$XBPS_HOSTDIR/distcc-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}"
         export DISTCC_HOSTS="$XBPS_DISTCC_HOSTS"
         export PATH="$DISTCCPATH:$PATH"
         mkdir -p $DISTCC_DIR