diff --git a/scripts/unpack b/scripts/unpack
index 6d970f499e..3c356a546e 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -126,8 +126,9 @@ for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
          $PKG_DIR/patches/$PKG_VERSION/*.patch \
          $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \
          $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch \
-         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch; \
-         $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch do
+         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH/*.patch \
+         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch \
+         $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch; do
 
   if [ $(dirname $i) = "$PKG_DIR/patches" ]; then
     PATCH_DESC="(common)"
@@ -137,8 +138,12 @@ for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
     PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)"
   elif [ $(dirname $i) = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then
     PATCH_DESC="(project)"
+  elif [ $(dirname $i) = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH" ]; then
+    PATCH_DESC="(project - $PATCH_ARCH)"
   elif [ $(dirname $i) = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION" ]; then
     PATCH_DESC="(project - $PKG_VERSION)"
+  elif [ $(dirname $i) = "$PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" ]; then
+    PATCH_DESC="(device)"
   fi
 
   if [ -f "$i" ]; then