diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 1e968e05dc..3e7a427794 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -30,8 +30,8 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"
 
 PATH=/void-packages:/usr/bin:/usr/sbin
 
-exec env -i PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/distcc" @@XARCH@@ \
-    CCACHE_DIR="/ccache" IN_CHROOT=1 LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
+exec env -i PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \
+    CCACHE_DIR="/host/ccache" IN_CHROOT=1 LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
     PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
 _EOF
     if [ -n "$XBPS_ARCH" ]; then
diff --git a/etc/defaults.conf b/etc/defaults.conf
index b088b560b3..a26337b966 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -40,12 +40,14 @@ XBPS_LDFLAGS="-Wl,--as-needed"
 XBPS_SUCMD="sudo /bin/sh -c"
 
 # [OPTIONAL]
-# Enable or disable ccache when building packages.
+# Enable or disable ccache when building packages. The ccache directory
+# is stored in the hostdir, i.e hostdir/ccache.
 #
 #XBPS_CCACHE=yes
 
 # [OPTIONAL]
-# Enable or disable distcc when building packages.
+# Enable or disable distcc when building packages. The distcc directory
+# is stored in the hostdir, i.e hostdir/distcc.
 #
 #XBPS_DISTCC=yes
 #XBPS_DISTCC_HOSTS=""
diff --git a/xbps-src b/xbps-src
index 8cb656e8f5..4ec5efe04d 100755
--- a/xbps-src
+++ b/xbps-src
@@ -485,28 +485,16 @@ else
     export PATH="$MYPATH"
     if [ -n "$XBPS_CCACHE" ]; then
         CCACHEPATH="/usr/lib/ccache/bin"
-        if [ -n "$XBPS_HOSTDIR" -a -d "$XBPS_HOSTDIR/ccache" ]; then
-            export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
-        else
-            if [ ! -d "$XBPS_MASTERDIR/ccache" ]; then
-                mkdir -p $XBPS_MASTERDIR/ccache
-            fi
-            export CCACHE_DIR="$XBPS_MASTERDIR/ccache"
-        fi
+        export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
         export PATH="$CCACHEPATH:$PATH"
+        mkdir -p $CCACHE_DIR
     fi
     if [ -n "$XBPS_DISTCC" ]; then
         DISTCCPATH="/usr/lib/distcc/bin"
-        if [ -n "$XBPS_HOSTDIR" -a -d "$XBPS_HOSTDIR/distcc" ]; then
-            export DISTCC_DIR="$XBPS_HOSTDIR/distcc"
-        else
-            if [ ! -d "$XBPS_MASTERDIR/distcc" ]; then
-                mkdir -p $XBPS_MASTERDIR/distcc
-            fi
-            export DISTCC_DIR="$XBPS_MASTERDIR/distcc"
-        fi
+        export DISTCC_DIR="$XBPS_HOSTDIR/distcc"
         export DISTCC_HOSTS="$XBPS_DISTCC_HOSTS"
         export PATH="$DISTCCPATH:$PATH"
+        mkdir -p $DISTCC_DIR
     fi
 fi