diff --git a/scripts/build b/scripts/build
index 2dc4f221d6..476f821260 100755
--- a/scripts/build
+++ b/scripts/build
@@ -54,6 +54,7 @@ STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
 $SCRIPTS/unpack $PACKAGE_NAME
 
 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 [ -f $STAMP ] ; then
   . $STAMP
diff --git a/scripts/skip_unpack b/scripts/skip_unpack
index c9a58688df..78248f0839 100755
--- a/scripts/skip_unpack
+++ b/scripts/skip_unpack
@@ -38,6 +38,7 @@ if [ -f $STAMP ] ; then
 
   rm -f $STAMP
   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"
   PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
   for i in PKG_NAME PKG_DEEPMD5; do
     eval val=\$$i
diff --git a/scripts/unpack b/scripts/unpack
index 3c356a546e..3e3d1855af 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -39,6 +39,7 @@ mkdir -p $BUILD
 [ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
 
 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"
 
 for i in $BUILD/$1-*; do
   if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then