diff --git a/alarm/firmware-raspberrypi/PKGBUILD b/alarm/firmware-raspberrypi/PKGBUILD
index 7b6bb03d2..7cad4b066 100644
--- a/alarm/firmware-raspberrypi/PKGBUILD
+++ b/alarm/firmware-raspberrypi/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=firmware-raspberrypi
 _firmcommit=4b356e134e8333d073bd3802d767a825adec3807
-_bluezcommit=9556b08ace2a1735127894642cc8ea6529c04c90
+_bluezcommit=78d6a07730e2d20c035899521ab67726dc028e1c
 pkgver=20240831
-pkgrel=1
+pkgrel=2
 pkgdesc="Additional firmware for Raspberry Pi"
 arch=('any')
 url="https://github.com/RPi-Distro/firmware-nonfree"
@@ -15,19 +15,24 @@ makedepends=('git')
 options=('!strip')
 source=("git+https://github.com/RPi-Distro/firmware-nonfree.git#commit=$_firmcommit"
         # support for which device?
-        "BCM4345C5.hcd::https://github.com/RPi-Distro/bluez-firmware/raw/$_bluezcommit/broadcom/BCM4345C5.hcd"
+        "BCM4345C5.hcd::https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/$_bluezcommit/debian/firmware/broadcom/BCM4345C5.hcd"
+        "BCM4343A2.hcd::https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/$_bluezcommit/debian/firmware/broadcom/BCM4343A2.hcd"
         # bluetooth for RPi3+
-        "BCM43430A1.hcd::https://github.com/RPi-Distro/bluez-firmware/raw/$_bluezcommit/broadcom/BCM43430A1.hcd"
-        "BCM4345C0.hcd::https://github.com/RPi-Distro/bluez-firmware/raw/$_bluezcommit/broadcom/BCM4345C0.hcd"
+        "BCM43430A1.hcd::https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/$_bluezcommit/debian/firmware/broadcom/BCM43430A1.hcd"
+        "BCM4345C0.hcd::https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/$_bluezcommit/debian/firmware/broadcom/BCM4345C0.hcd"
         # bluetooth for Zero 2 W
-        "BCM43430B0.hcd::https://github.com/RPi-Distro/bluez-firmware/raw/$_bluezcommit/broadcom/BCM43430B0.hcd"
+        "BCM43430B0.hcd::https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/$_bluezcommit/debian/firmware/broadcom/BCM43430B0.hcd"
+        # license
+        "LICENSE.cypress::https://raw.githubusercontent.com/RPi-Distro/bluez-firmware/$_bluezcommit/debian/firmware/broadcom/LICENSE.cypress"
         'RPi-WM8804.conf')
 
 sha256sums=('247bdaa9d3596fabb84f050b5e14cd990e224e9151f77528caec23fab7bcdaaa'
             'fb9f4ec2df5301bd35f416384e103c012c5983024c49aa72fbbaf90177512caa'
+            '5f7fb0a863f9ee8874e4ad37ccc69abbc751fdc0257cb3fdd0ba0e89378ff76a'
             'c096ad4a5c3f06ed7d69eba246bf89ada9acba64a5b6f51b1e9c12f99bb1e1a7'
             '51c45e77ddad91a19e96dc8fb75295b2087c279940df2634b23baf71b6dea42c'
             '338c2c6631131f516bfc7e64ef0872bd0402e1f98ef9d0c900eef0c814d90a25'
+            'a92f031f19089fa63bd24ac4c5298ca1356670321b39c67024a961ee3285fff7'
             'f978fbc40db75ba3213a4472023496d0716706eb1a6f078f207ac027c5753f43')
 
 package() {
@@ -36,6 +41,9 @@ package() {
   # https://github.com/RPi-Distro/firmware-nonfree/issues/26
   unlink "$srcdir/$_FWPATH/brcm/brcmfmac43455-sdio.bin"
 
+  mkdir -p "$pkgdir/usr/share/licenses/broadcom/cypress"
+  install -m 0644 LICENSE.cypress "$pkgdir/usr/share/licenses/broadcom/cypress/LICENSE"
+
   # install cypress dir and symlink cyfmac43455-sdio-standard.bin which debian
   # packaging does, see README.txt in /cypress and comments in this commit:
   # https://github.com/RPi-Distro/firmware-nonfree/commit/3b108c864428dda9f9833cf3346f438552d08cea