diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 9d549cbe582..044fb669988 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,9 +1,9 @@
 # Template file for 'rpi-firmware'
-_githash="ce8652e2c743f02f04cb29f23611cbf13765483b"
+_githash="287af2a2be0787a5d45281d1d6183a2161c798d4"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20180328
+version=20180505
 revision=1
 noarch=yes
 wrksrc="firmware-${_githash}"
@@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="3-clause-BSD"
 homepage="https://github.com/raspberrypi/firmware"
 distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=e6dfad437e64f2925361a8927061d05764436faf2c0b412a5ae4a48995d6e8e4
+checksum=5edff641f216d2e09c75469dc2e9fc66aff290e212a1cd43ed31c499f99ea055
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 
@@ -38,9 +38,17 @@ do_install() {
 		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
 
+	# Firmware for rpi3 b and zero bluetooth chip
+	$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43430/BCM43430A1.hcd
+	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
+
 	# Firmware for rpi3 b+ wifi chip
 	for f in bin txt clm_blob; do
 		$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.${f}
 		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
 	done
+
+	# Firmware for rpi3 b+ bluetooth chip
+	$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd
+	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm
 }