diff --git a/alarm/firmware-raspberrypi/PKGBUILD b/alarm/firmware-raspberrypi/PKGBUILD
index 0f0fbf295..fdf6d77c4 100644
--- a/alarm/firmware-raspberrypi/PKGBUILD
+++ b/alarm/firmware-raspberrypi/PKGBUILD
@@ -4,9 +4,9 @@
 buildarch=28
 
 pkgname=firmware-raspberrypi
-_firmcommit=f713a6054746bc61ece1c8696dce91a7b7e22dd9
+_firmcommit=bda9207acee945633464e89614f3717b856579b5
 _bluezcommit=8445a53ce2c51a77472b908a0c8f6f8e1fa5c37a
-pkgver=20210224
+pkgver=20211028
 pkgrel=1
 pkgdesc="Additional firmware for Raspberry Pi"
 arch=('any')
@@ -21,6 +21,9 @@ source=(
         'brcmfmac43455-sdio.raspberrypi,4-model-b.txt'
         # fixes buggy linux-firmware for Zero-W
         'https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.txt'
+        # Zero 2 W support
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43436s-sdio.txt"
+        "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43436s-sdio.bin"
         # BCM43456 on RPi-400
         "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.bin"
         "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.clm_blob"
@@ -31,6 +34,8 @@ sha256sums=('c096ad4a5c3f06ed7d69eba246bf89ada9acba64a5b6f51b1e9c12f99bb1e1a7'
             'c723c903655086c9f3a1de94a291f495a0f087f1ee6d3ee7bc4c558497aae7bc'
             'edb6f4e4fb19e18940004124feb4ffe160d72fc607243a07a4480338a28b2748'
             'e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0'
+            '0441797884bbbd40a86e4579ff0e1c84ce69bb41f7bcf902a5c867ebb79b6ac3'
+            'bdc4fc14ca428130f474bb2f8bcb34c0684b0f9a0f31b05b4da39d64a2e1a333'
             'ddf83f2100885b166be52d21c8966db164fdd4e1d816aca2acc67ee9cc28d726'
             '2dbd7d22fc9af0eb560ceab45b19646d211bc7b34a1dd00c6bfac5dd6ba25e8a'
             '44e0bb322dc1f39a4b0a89f30ffdd28bc93f7d7aaf534d06d229fe56f6198194'