diff --git a/core/linux-rpi/PKGBUILD b/core/linux-rpi/PKGBUILD
index f526b1acf..93f50b798 100644
--- a/core/linux-rpi/PKGBUILD
+++ b/core/linux-rpi/PKGBUILD
@@ -9,7 +9,7 @@ _commit=8f1f0ad34428f0ff5879257664c5fe6b950b58a3
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 pkgver=5.15.89
-pkgrel=4
+pkgrel=5
 pkgdesc='Linux'
 url="http://www.kernel.org/"
 arch=(armv7h aarch64)
@@ -180,13 +180,6 @@ _package-headers() {
     rm -r "$_arch"
   done
 
-  if [[ $CARCH == "aarch64" ]]; then
-    echo "Symlinking aarch64 to arm64"
-    # expect aarch64 not arm64 for example:
-    # https://archlinuxarm.org/forum/viewtopic.php?f=60&t=16354
-    ln -sr "$builddir/arch/arm64" "$builddir/arch/aarch64"
-  fi
-
   echo "Removing documentation..."
   rm -r "$builddir/Documentation"
 
@@ -196,6 +189,11 @@ _package-headers() {
   echo "Removing loose objects..."
   find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
 
+  echo "Symlinking common aliases..."
+  # https://archlinuxarm.org/forum/viewtopic.php?f=60&t=16354
+  [[ -d "$builddir/arch/arm" ]] && ln -sr "$builddir/arch/arm" "$builddir/arch/armv7l"
+  [[ -d "$builddir/arch/arm64" ]] && ln -sr "$builddir/arch/arm64" "$builddir/arch/aarch64"
+
   echo "Stripping build tools..."
   local file
   while read -rd '' file; do