diff --git a/alarm/firmware-raspberrypi/PKGBUILD b/alarm/firmware-raspberrypi/PKGBUILD
index 2f1a0087b..28f4e1a63 100644
--- a/alarm/firmware-raspberrypi/PKGBUILD
+++ b/alarm/firmware-raspberrypi/PKGBUILD
@@ -12,30 +12,35 @@ arch=('any')
 url="https://github.com/RPi-Distro/firmware-nonfree/commits/master/brcm"
 license=('custom')
 options=('!strip')
-source=('https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.bin'
-        'https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.txt'
+source=(
+        # bluetooth for RPi3+
         'https://archlinuxarm.org/builder/src/bcm43430/BCM43430A1.hcd'
         'https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd'
+        # BCM43430 on RPi-Zero/3A/3B
+        'https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.bin'
+        'https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-sdio.txt'
+        # BCM43455 on RPi-3A+/3B+/4B/CM4
         "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43455-sdio.bin"
         "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43455-sdio.clm_blob"
         "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43455-sdio.txt"
+        'brcmfmac43455-sdio.raspberrypi,4-model-b.txt'
+        # 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"
         "https://github.com/RPi-Distro/firmware-nonfree/raw/$_firmcommit/brcm/brcmfmac43456-sdio.txt"
-        'brcmfmac43455-sdio.raspberrypi,4-model-b.txt'
         'RPi-WM8804.conf')
 
-sha256sums=('996b7ef7cbdb8ea3855fa516acb57630ff03a449fd3bb23e84789f2f04b4faf5'
-            'e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0'
-            '8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930'
+sha256sums=('8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930'
             '1788c58ecedd61b380e0dd120844ed61e5fbbea0a58e84e6293685eb3384fddc'
+            '996b7ef7cbdb8ea3855fa516acb57630ff03a449fd3bb23e84789f2f04b4faf5'
+            'e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0'
             'cf79e8e8727d103a94cd243f1d98770fa29f5da25df251d0d31b3696f3b4ac6a'
             '2dbd7d22fc9af0eb560ceab45b19646d211bc7b34a1dd00c6bfac5dd6ba25e8a'
             'ca709be81a78bdb6932936374f39943acbd7af07fae6151011127599a3ce9e3d'
+            'edb6f4e4fb19e18940004124feb4ffe160d72fc607243a07a4480338a28b2748'
             'ddf83f2100885b166be52d21c8966db164fdd4e1d816aca2acc67ee9cc28d726'
             '2dbd7d22fc9af0eb560ceab45b19646d211bc7b34a1dd00c6bfac5dd6ba25e8a'
             '44e0bb322dc1f39a4b0a89f30ffdd28bc93f7d7aaf534d06d229fe56f6198194'
-            'edb6f4e4fb19e18940004124feb4ffe160d72fc607243a07a4480338a28b2748'
             'f978fbc40db75ba3213a4472023496d0716706eb1a6f078f207ac027c5753f43')
 
 package() {