diff --git a/alarm/firmware-raspberrypi/PKGBUILD b/alarm/firmware-raspberrypi/PKGBUILD
index 0f8631911..7b6039d82 100644
--- a/alarm/firmware-raspberrypi/PKGBUILD
+++ b/alarm/firmware-raspberrypi/PKGBUILD
@@ -37,15 +37,17 @@ sha256sums=('SKIP'
             'f978fbc40db75ba3213a4472023496d0716706eb1a6f078f207ac027c5753f43')
 
 package() {
+  _FWPATH=firmware-nonfree/debian/config/brcm80211
+
   # https://github.com/RPi-Distro/firmware-nonfree/issues/26
-  unlink "$srcdir"/firmware-nonfree/debian/config/brcm80211/brcm/brcmfmac43455-sdio.bin
+  unlink "$srcdir/$_FWPATH/brcm/brcmfmac43455-sdio.bin"
 
   install -d "$pkgdir"/usr/lib/firmware/updates/brcm "$pkgdir"/usr/share/alsa/cards/
   install -m 0644 *.hcd "$pkgdir"/usr/lib/firmware/updates/brcm
   install -m 0644 RPi-WM8804.conf "$pkgdir"/usr/share/alsa/cards/
-  install -m 0644 "$srcdir"/firmware-nonfree/debian/config/brcm80211/brcm/* "$pkgdir"/usr/lib/firmware/updates/brcm
+  install -m 0644 "$srcdir/$_FWPATH/brcm/"* "$pkgdir"/usr/lib/firmware/updates/brcm
   rm "$pkgdir"/usr/lib/firmware/updates/brcm/{brcmfmac43430-sdio.bin,brcmfmac43430-sdio.txt}
-  install -m 0644 "$srcdir"/firmware-nonfree/debian/config/brcm80211/cypress/{cyfmac43455-sdio-*.bin,README.txt} "$pkgdir"/usr/lib/firmware/updates/brcm
+  install -m 0644 "$srcdir/$_FWPATH/cypress/"{cyfmac43455-sdio-*.bin,README.txt} "$pkgdir"/usr/lib/firmware/updates/brcm
 
   # make some symbolic links
   cd "$pkgdir"/usr/lib/firmware/updates/brcm