diff --git a/scripts/unpack b/scripts/unpack
index 2d6f79b527..fc2ccb43ac 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -119,14 +119,24 @@ if [ "$(type -t pre_patch)" = "function" ]; then
   pre_patch
 fi
 
+if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
+  PATCH_ARCH="x86"
+else
+  PATCH_ARCH="$TARGET_ARCH"
+fi
+
 for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
+         $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \
          $PKG_DIR/patches/$PKG_VERSION/*.patch \
+         $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \
          $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch; do
 
   if [ $(dirname $i) = "$PKG_DIR/patches" ]; then
     PATCH_DESC="(common)"
-  elif [ $(dirname $i) = "$PKG_DIR/patches/$PKG_VERSION" ]; then
-    PATCH_DESC="($PKG_VERSION)"
+  elif [ $(dirname $i) = "$PKG_DIR/patches/$PATCH_ARCH" ]; then
+    PATCH_DESC="(common - $PATCH_ARCH)"
+  elif [ $(dirname $i) = "$PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH" ]; then
+    PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)"
   elif [ $(dirname $i) = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then
     PATCH_DESC="(project)"
   fi