diff --git a/scripts/unpack b/scripts/unpack
index 28bd13bf37..581272d2a8 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -39,9 +39,9 @@ mkdir -p $BUILD
 STAMP_DEPENDS="$PKG_DIR $PKG_NEED_UNPACK $PROJECT_DIR/$PROJECT/patches/$PKG_NAME"
 [ -n "$DEVICE" ] && STAMP_DEPENDS="$STAMP_DEPENDS $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME"
 
-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
       PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
       if [ ! "$PKG_DEEPMD5" = "$STAMP_PKG_DEEPMD5" ] ; then
@@ -49,7 +49,7 @@ if [ -d "$PKG_BUILD" ]; then
       fi
     fi
   fi
-fi
+done
 
 if [ -d "$PKG_BUILD" -a ! -f "$STAMP" ]; then
   # stale pkg build dir