diff --git a/xbps-src b/xbps-src
index 1a43dd5cf21..f7ff84c191f 100755
--- a/xbps-src
+++ b/xbps-src
@@ -329,21 +329,9 @@ bootstrap_update() {
 }
 
 masterdir_zap() {
-    for f in bin boot builddir destdir dev etc home lib lib32 lib64 mnt \
-        opt proc root run sbin sys tmp usr var host media xbps \
-        void-packages .xbps_chroot_init .xbps_chroot_configured; do
-        if [ -d "$XBPS_MASTERDIR/$f" ]; then
-            echo "Removing directory $XBPS_MASTERDIR/$f ..."
-            rm -rf $XBPS_MASTERDIR/$f
-        elif [ -h "$XBPS_MASTERDIR/$f" ]; then
-            echo "Removing link $XBPS_MASTERDIR/$f ..."
-            rm -f $XBPS_MASTERDIR/$f
-        elif [ -f "$XBPS_MASTERDIR/$f" ]; then
-            echo "Removing file $XBPS_MASTERDIR/$f ..."
-            rm -f $XBPS_MASTERDIR/$f
-        fi
-    done
-    echo "$XBPS_MASTERDIR masterdir cleaned up."
+    rm -rf "$XBPS_MASTERDIR"
+    mkdir -p "$XBPS_MASTERDIR"
+    msg_normal "$XBPS_MASTERDIR masterdir cleaned up."
 }
 
 exit_func() {