diff --git a/scripts/clean b/scripts/clean
index 6187f61597..ac72cf1752 100755
--- a/scripts/clean
+++ b/scripts/clean
@@ -29,21 +29,19 @@ clean_package() {
     return
   fi
 
-  STAMP=$PKG_BUILD/.libreelec-unpack
-
-  if [ -d "$PKG_BUILD" ]; then
-    if [ -f "$STAMP" ] ; then
-      . "$STAMP"
+  for i in $BUILD/$1-*; do
+    if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then
+      . "$i/.libreelec-unpack"
       if [ "$STAMP_PKG_NAME" = "$1" ]; then
-        printf "%${BUILD_INDENT}c ${boldred}*${endcolor} ${red}Removing $PKG_BUILD ...${endcolor}\n" ' '>&$SILENT_OUT
-        rm -rf "$PKG_BUILD"
+        printf "%${BUILD_INDENT}c ${boldred}*${endcolor} ${red}Removing $i ...${endcolor}\n" ' '>&$SILENT_OUT
+        rm -rf $i
       fi
     else
       # force clean if no stamp found (previous unpack failed)
-      printf "%${BUILD_INDENT}c * Removing $PKG_BUILD ...\n" ' '>&$SILENT_OUT
-      rm -rf "$PKG_BUILD"
+      printf "%${BUILD_INDENT}c * Removing $i ...\n" ' '>&$SILENT_OUT
+      rm -rf $i
     fi
-  fi
+  done
   rm -f $STAMPS/$1/build_*
 }