diff --git a/xbps-src b/xbps-src
index 5c37441792..cbe4c73b90 100755
--- a/xbps-src
+++ b/xbps-src
@@ -734,9 +734,11 @@ case "$XBPS_TARGET" in
             fi
             msg_normal "xbps-src: cleaning up masterdir...\n"
             # Needed to remove Go Modules
-            [ -d $XBPS_MASTERDIR/builddir ] && chmod -R +wX $XBPS_MASTERDIR/builddir
-            rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
-            rm -f $XBPS_MASTERDIR/tmp/* >/dev/null 2>&1
+            [ -d "$XBPS_BUILDDIR" ] && chmod -R +wX $XBPS_BUILDDIR
+            rm -rf \
+                $XBPS_BUILDDIR \
+                $XBPS_DESTDIR \
+                $XBPS_MASTERDIR/tmp/* $XBPS_MASTERDIR/tmp/.*
         else
             read_pkg
             if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then