diff --git a/raspberrypi-firmware.spec b/raspberrypi-firmware.spec
index 6f79dd1..e0288cb 100644
--- a/raspberrypi-firmware.spec
+++ b/raspberrypi-firmware.spec
@@ -1,11 +1,11 @@
 # the userspace libraries and devel files are now available in raspberrypi-userland
-%define include_kernel 1
+%define include_kernel 0
 %define kernelver   %(echo %version | cut -d. -f1-3)
 %define gitdirver %(echo %version | cut -d. -f4-5)
 
 Name:          raspberrypi-firmware
 Epoch:         1
-Version:       5.10.17.1.20210303
+Version:       5.15.30.1.20220328
 Release:       1mamba
 Summary:       Boot firmware files (except kernel) for the Raspberry Pi
 Group:         System/Kernel and Hardware
@@ -13,7 +13,7 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://github.com/raspberrypi/firmware
-Source0:       https://github.com/raspberrypi/firmware/archive/refs/tags/%{gitdirver}.tar.gz
+Source0:       https://github.com/raspberrypi/firmware/archive/refs/tags/%{gitdirver}.zip
 #Source0:       git://github.com/raspberrypi/firmware.git/%{gitdirver}/firmware-%{version}.tar.bz2
 Source1:       raspberrypi-firmware-kernelconf.txt
 Source2:       raspberrypi-firmware-kernelcmdline.txt
@@ -89,16 +89,17 @@ Summary:       Documentation for the Raspberry Pi Linux kernel
 Documentation for the Raspberry Pi Linux kernel.
 
 %prep
-%setup -q -n firmware-%{gitdirver}
+%setup -q -c
 %define __os_install_post %{nil}
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+cd firmware-%{gitdirver}
 
 # kernel + kernel modules + firmware
 install -d %{buildroot}/boot
 
-%if %include_kernel
+%if "%{include_kernel}" == "1"
 install -d %{buildroot}/lib/modules
 %ifarch aarch64
 boot_klist="\
@@ -114,6 +115,7 @@ cp -R modules/%{kernelver}+ %{buildroot}/lib/modules/
 cp -R modules/%{kernelver}-v7+ %{buildroot}/lib/modules/
 cp -R modules/%{kernelver}-v7l+ %{buildroot}/lib/modules/
 %endif
+%endif
 
 boot_flist="\
 bootcode.bin 
@@ -130,7 +132,6 @@ cp -a boot/overlays %{buildroot}/boot/overlays/
 
 install -d %{buildroot}%{_datadir}/doc/raspberrypi-kernel
 cp -R documentation/ilcomponents %{buildroot}%{_datadir}/doc/raspberrypi-kernel
-%endif
 
 install -d %{buildroot}/lib/firmware/brcm
 install -D -m0644 %{SOURCE21} %{buildroot}/lib/firmware/brcm/brcmfmac43430-sdio.txt
@@ -166,13 +167,16 @@ install %{S:2} %{buildroot}/boot/cmdline.txt
 /boot/bcm2708-rpi-b-plus.dtb
 /boot/bcm2708-rpi-b-rev1.dtb
 /boot/bcm2708-rpi-cm.dtb
-/boot/bcm2711-rpi-cm4.dtb
 /boot/bcm2709-rpi-2-b.dtb
 /boot/bcm2710-rpi-2-b.dtb
 /boot/bcm2710-rpi-3-b.dtb
 /boot/bcm2710-rpi-3-b-plus.dtb
-/boot/bcm2711-rpi-4-b.dtb
 /boot/bcm2710-rpi-cm3.dtb
+/boot/bcm2710-rpi-zero-2-w.dtb
+/boot/bcm2710-rpi-zero-2.dtb
+/boot/bcm2711-rpi-4-b.dtb
+/boot/bcm2711-rpi-cm4.dtb
+/boot/bcm2711-rpi-cm4s.dtb
 /boot/bcm2711-rpi-400.dtb
 /boot/LICENCE.broadcom
 %config(noreplace) /boot/config.txt
@@ -188,7 +192,7 @@ install %{S:2} %{buildroot}/boot/cmdline.txt
 /boot/overlays/overlay_map.dtb
 /boot/overlays/README
 
-%if %include_kernel
+%if "%{include_kernel}" == "1"
 %ifarch arm
 %files -n kernel-raspberrypi
 %defattr(-,root,root)
@@ -216,13 +220,16 @@ install %{S:2} %{buildroot}/boot/cmdline.txt
 %dir /lib/modules/%{kernelver}-v8+
 /lib/modules/%{kernelver}-v8+/*
 %endif
+%endif
 
 %files -n kernel-raspberrypi-doc
 %defattr(-,root,root)
 %{_datadir}/doc/raspberrypi-kernel
-%endif
 
 %changelog
+* Sat Apr 02 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.30.1.20220328-1mamba
+- update to 5.15.30.1.20220328
+
 * Fri Apr 23 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10.17.1.20210303-1mamba
 - update to 5.10.17.1.20210303
 - remove BCM43430A1.hcd but require recent bluez-firmware