diff --git a/scripts/unpack b/scripts/unpack
index c55a04086e..ce862102b4 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -36,9 +36,6 @@ mkdir -p $BUILD
 
 [ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
 
-# TODO: remove
-[ -f "$STAMP" -a -f "$PKG_DIR/need_unpack" ] && $PKG_DIR/need_unpack $@
-
 for i in $BUILD/$1-*; do
   if [ -d $i -a -f "$i/.openelec-unpack" ] ; then
     . "$i/.openelec-unpack"
@@ -52,6 +49,13 @@ for i in $BUILD/$1-*; do
         CLEAN_SOURCE=yes
         break
       fi
+      # handle $PKG_NEED_UNPACK
+      for file in $PKG_NEED_UNPACK; do
+        if [ -f "$file" -a "$file" -nt "$i/.openelec-unpack" ] ; then
+          CLEAN_SOURCE=yes
+          break
+        fi
+      done
       # trigger unpack / full rebuild on any patch change
       for patch in $PKG_DIR/patches/* $PKG_DIR/patches.upstream/*; do
         if [ -f "$patch" -a "$patch" -nt "$i/.openelec-unpack" ]; then