diff --git a/xbps-src b/xbps-src
index 1ccca6abebe..7a3418d3462 100755
--- a/xbps-src
+++ b/xbps-src
@@ -26,8 +26,10 @@ build <pkgname>
 chroot
     Enter to the chroot in <masterdir>.
 
-clean <pkgname>
-    Remove <pkgname> build directory.
+clean [pkgname]
+    Removes auto dependencies, cleans up <masterdir>/builddir and <masterdir>/destdir.
+    If <pkgname> argument is specified only the builddir for that package will be
+    cleaned up.
 
 configure <pkgname>
     Configure a package (fetch + extract + configure).
@@ -558,13 +560,19 @@ case "$XBPS_TARGET" in
         chroot_handler chroot dummy
         ;;
     clean)
-        read_pkg
-        if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
-            chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG || exit $?
+        if [ -z "$XBPS_TARGET_PKG" ]; then
+            chroot_handler remove-autodeps
+            msg_normal "xbps-src: cleaning up masterdir...\n"
+            rm -rf $XBPS_MASTERDIR/builddir/* $XBPS_MASTERDIR/destdir/*
         else
-            remove_pkg_wrksrc $wrksrc
-            if declare -f do_clean >/dev/null; then
-                run_func do_clean
+            read_pkg
+            if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
+                chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG || exit $?
+            else
+                remove_pkg_wrksrc $wrksrc
+                if declare -f do_clean >/dev/null; then
+                    run_func do_clean
+                fi
             fi
         fi
         ;;