diff --git a/extra/pipewire/PKGBUILD b/extra/pipewire/PKGBUILD
index 1701a7934..0485e8279 100644
--- a/extra/pipewire/PKGBUILD
+++ b/extra/pipewire/PKGBUILD
@@ -3,6 +3,8 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - remove makedepend on valgrind
+#  - patch to disable neon
+#  - cherry-pick upstream patch to fix neon disable
 
 pkgbase=pipewire
 pkgname=(pipewire alsa-card-profiles pipewire-docs pipewire-alsa pipewire-jack
@@ -20,8 +22,10 @@ makedepends=(git meson doxygen graphviz python-docutils libpulse
              webrtc-audio-processing)
 checkdepends=(desktop-file-utils)
 _commit=5b7ef959d1fed35f6ddfcf94b6f57891fae23b31  # tags/0.3.39
-source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit"
+        0001-disable-neon.patch)
+sha256sums=('SKIP'
+            '03692caee572d9e9c5d4f68986533c24ed84163c1ad607c7a13ef50cc3f8558e')
 
 pkgver() {
   cd pipewire
@@ -30,6 +34,10 @@ pkgver() {
 
 prepare() {
   cd pipewire
+  if [[ $CARCH != "aarch64" ]]; then
+    git cherry-pick -n 651f0decea5f83730c271e9bed03cdd0048fcd49
+    patch -p1 -i ../0001-disable-neon.patch
+  fi
 }
 
 build() {