diff --git a/pkg/firmware-rpi3/boot-rpi3-dtb.desc b/pkg/firmware-rpi3/boot-rpi3-dtb.desc
new file mode 100644
index 0000000..e69de29
diff --git a/pkg/firmware-rpi3/boot-rpi3-dtb.files b/pkg/firmware-rpi3/boot-rpi3-dtb.files
new file mode 100644
index 0000000..c984408
--- /dev/null
+++ b/pkg/firmware-rpi3/boot-rpi3-dtb.files
@@ -0,0 +1,8 @@
+file bcm2708-rpi-b-plus.dtb 0664 0 0
+file bcm2708-rpi-cm.dtb 0664 0 0
+file bcm2708-rpi-b.dtb 0664 0 0
+file bcm2708-rpi-0-w.dtb 0664 0 0
+file bcm2709-rpi-2-b.dtb 0664 0 0
+file bcm2710-rpi-3-b-plus.dtb 0664 0 0
+file bcm2710-rpi-3-b.dtb 0664 0 0
+file bcm2710-rpi-cm3.dtb 0664 0 0
diff --git a/pkg/firmware-rpi3/boot-rpi3-dtbo.desc b/pkg/firmware-rpi3/boot-rpi3-dtbo.desc
new file mode 100644
index 0000000..e69de29
diff --git a/pkg/firmware-rpi3/boot-rpi3-dtbo.files b/pkg/firmware-rpi3/boot-rpi3-dtbo.files
new file mode 100644
index 0000000..fdd9e9e
--- /dev/null
+++ b/pkg/firmware-rpi3/boot-rpi3-dtbo.files
@@ -0,0 +1,150 @@
+dir overlays 0775 0 0
+file overlays/spi0-cs.dtbo 0664 0 0
+file overlays/vc4-kms-kippah-7inch.dtbo 0664 0 0
+file overlays/rra-digidac1-wm8741-audio.dtbo 0664 0 0
+file overlays/rotary-encoder.dtbo 0664 0 0
+file overlays/spi-gpio35-39.dtbo 0664 0 0
+file overlays/rpi-dac.dtbo 0664 0 0
+file overlays/rpi-display.dtbo 0664 0 0
+file overlays/audioinjector-ultra.dtbo 0664 0 0
+file overlays/gpio-no-irq.dtbo 0664 0 0
+file overlays/i2c-bcm2708.dtbo 0664 0 0
+file overlays/hy28b-2017.dtbo 0664 0 0
+file overlays/ads7846.dtbo 0664 0 0
+file overlays/rpi-backlight.dtbo 0664 0 0
+file overlays/pitft35-resistive.dtbo 0664 0 0
+file overlays/exc3000.dtbo 0664 0 0
+file overlays/w1-gpio.dtbo 0664 0 0
+file overlays/i2c-gpio.dtbo 0664 0 0
+file overlays/w1-gpio-pullup.dtbo 0664 0 0
+file overlays/sc16is750-i2c.dtbo 0664 0 0
+file overlays/vc4-fkms-v3d.dtbo 0664 0 0
+file overlays/vga666.dtbo 0664 0 0
+file overlays/adv728x-m.dtbo 0664 0 0
+file overlays/audremap.dtbo 0664 0 0
+file overlays/allo-katana-dac-audio.dtbo 0664 0 0
+file overlays/gpio-no-bank0-irq.dtbo 0664 0 0
+file overlays/sc16is752-i2c.dtbo 0664 0 0
+file overlays/gpio-shutdown.dtbo 0664 0 0
+file overlays/adau1977-adc.dtbo 0664 0 0
+file overlays/pitft22.dtbo 0664 0 0
+file overlays/gpio-poweroff.dtbo 0664 0 0
+file overlays/spi1-2cs.dtbo 0664 0 0
+file overlays/mbed-dac.dtbo 0664 0 0
+file overlays/uart1.dtbo 0664 0 0
+file overlays/hy28b.dtbo 0664 0 0
+file overlays/smi-nand.dtbo 0664 0 0
+file overlays/hifiberry-amp.dtbo 0664 0 0
+file overlays/i2c-rtc.dtbo 0664 0 0
+file overlays/iqaudio-dac.dtbo 0664 0 0
+file overlays/wittypi.dtbo 0664 0 0
+file overlays/tc358743-audio.dtbo 0664 0 0
+file overlays/pps-gpio.dtbo 0664 0 0
+file overlays/akkordion-iqdacplus.dtbo 0664 0 0
+file overlays/rpi-cirrus-wm5102.dtbo 0664 0 0
+file overlays/sdio-1bit.dtbo 0664 0 0
+file overlays/justboom-dac.dtbo 0664 0 0
+file overlays/gpio-ir-tx.dtbo 0664 0 0
+file overlays/mcp23s17.dtbo 0664 0 0
+file overlays/rpi-tv.dtbo 0664 0 0
+file overlays/pi3-miniuart-bt.dtbo 0664 0 0
+file overlays/pi3-act-led.dtbo 0664 0 0
+file overlays/uart0.dtbo 0664 0 0
+file overlays/i2c-mux.dtbo 0664 0 0
+file overlays/pi3-disable-wifi.dtbo 0664 0 0
+file overlays/pi3-disable-bt.dtbo 0664 0 0
+file overlays/pwm-ir-tx.dtbo 0664 0 0
+file overlays/iqaudio-dacplus.dtbo 0664 0 0
+file overlays/ltc294x.dtbo 0664 0 0
+file overlays/gpio-ir.dtbo 0664 0 0
+file overlays/i2c-rtc-gpio.dtbo 0664 0 0
+file overlays/ads1015.dtbo 0664 0 0
+file overlays/papirus.dtbo 0664 0 0
+file overlays/rpi-poe.dtbo 0664 0 0
+file overlays/sc16is752-spi1.dtbo 0664 0 0
+file overlays/dionaudio-loco.dtbo 0664 0 0
+file overlays/README 0664 0 0
+file overlays/superaudioboard.dtbo 0664 0 0
+file overlays/piscreen.dtbo 0664 0 0
+file overlays/i2c-pwm-pca9685a.dtbo 0664 0 0
+file overlays/mcp23017.dtbo 0664 0 0
+file overlays/gpio-key.dtbo 0664 0 0
+file overlays/midi-uart0.dtbo 0664 0 0
+file overlays/mcp3202.dtbo 0664 0 0
+file overlays/sdio.dtbo 0664 0 0
+file overlays/spi2-2cs.dtbo 0664 0 0
+file overlays/qca7000.dtbo 0664 0 0
+file overlays/at86rf233.dtbo 0664 0 0
+file overlays/spi1-3cs.dtbo 0664 0 0
+file overlays/i2c1-bcm2708.dtbo 0664 0 0
+file overlays/mpu6050.dtbo 0664 0 0
+file overlays/midi-uart1.dtbo 0664 0 0
+file overlays/sdtweak.dtbo 0664 0 0
+file overlays/dionaudio-loco-v2.dtbo 0664 0 0
+file overlays/upstream.dtbo 0664 0 0
+file overlays/justboom-digi.dtbo 0664 0 0
+file overlays/audioinjector-wm8731-audio.dtbo 0664 0 0
+file overlays/enc28j60-spi2.dtbo 0664 0 0
+file overlays/dpi18.dtbo 0664 0 0
+file overlays/ads1115.dtbo 0664 0 0
+file overlays/enc28j60.dtbo 0664 0 0
+file overlays/mcp2515-can0.dtbo 0664 0 0
+file overlays/dpi24.dtbo 0664 0 0
+file overlays/dht11.dtbo 0664 0 0
+file overlays/smi.dtbo 0664 0 0
+file overlays/spi2-3cs.dtbo 0664 0 0
+file overlays/smi-dev.dtbo 0664 0 0
+file overlays/media-center.dtbo 0664 0 0
+file overlays/adv7282m.dtbo 0664 0 0
+file overlays/piscreen2r.dtbo 0664 0 0
+file overlays/sdhost.dtbo 0664 0 0
+file overlays/ov5647.dtbo 0664 0 0
+file overlays/spi-rtc.dtbo 0664 0 0
+file overlays/lirc-rpi.dtbo 0664 0 0
+file overlays/spi0-hw-cs.dtbo 0664 0 0
+file overlays/vc4-kms-v3d.dtbo 0664 0 0
+file overlays/rpi-ft5406.dtbo 0664 0 0
+file overlays/mz61581.dtbo 0664 0 0
+file overlays/mmc.dtbo 0664 0 0
+file overlays/hifiberry-dac.dtbo 0664 0 0
+file overlays/i2s-gpio28-31.dtbo 0664 0 0
+file overlays/i2c-sensor.dtbo 0664 0 0
+file overlays/allo-piano-dac-plus-pcm512x-audio.dtbo 0664 0 0
+file overlays/upstream-aux-interrupt.dtbo 0664 0 0
+file overlays/i2c0-bcm2708.dtbo 0664 0 0
+file overlays/balena-fin.dtbo 0664 0 0
+file overlays/mcp3008.dtbo 0664 0 0
+file overlays/tinylcd35.dtbo 0664 0 0
+file overlays/pitft28-resistive.dtbo 0664 0 0
+file overlays/hd44780-lcd.dtbo 0664 0 0
+file overlays/allo-boss-dac-pcm512x-audio.dtbo 0664 0 0
+file overlays/sx150x.dtbo 0664 0 0
+file overlays/pisound.dtbo 0664 0 0
+file overlays/allo-piano-dac-pcm512x-audio.dtbo 0664 0 0
+file overlays/dwc2.dtbo 0664 0 0
+file overlays/hy28a.dtbo 0664 0 0
+file overlays/jedec-spi-nor.dtbo 0664 0 0
+file overlays/hifiberry-digi.dtbo 0664 0 0
+file overlays/pibell.dtbo 0664 0 0
+file overlays/spi2-1cs.dtbo 0664 0 0
+file overlays/audioinjector-addons.dtbo 0664 0 0
+file overlays/rpi-proto.dtbo 0664 0 0
+file overlays/goodix.dtbo 0664 0 0
+file overlays/gpio-fan.dtbo 0664 0 0
+file overlays/bmp085_i2c-sensor.dtbo 0664 0 0
+file overlays/hifiberry-digi-pro.dtbo 0664 0 0
+file overlays/spi1-1cs.dtbo 0664 0 0
+file overlays/pwm.dtbo 0664 0 0
+file overlays/dwc-otg.dtbo 0664 0 0
+file overlays/adau7002-simple.dtbo 0664 0 0
+file overlays/pitft28-capacitive.dtbo 0664 0 0
+file overlays/pwm-2chan.dtbo 0664 0 0
+file overlays/tc358743.dtbo 0664 0 0
+file overlays/googlevoicehat-soundcard.dtbo 0664 0 0
+file overlays/fe-pi-audio.dtbo 0664 0 0
+file overlays/applepi-dac.dtbo 0664 0 0
+file overlays/rpi-sense.dtbo 0664 0 0
+file overlays/hifiberry-dacplus.dtbo 0664 0 0
+file overlays/iqaudio-digi-wm8804-audio.dtbo 0664 0 0
+file overlays/mcp2515-can1.dtbo 0664 0 0
+file overlays/allo-digione.dtbo 0664 0 0
diff --git a/pkg/firmware-rpi3/boot-rpi3.files b/pkg/firmware-rpi3/boot-rpi3.files
index aa617f2..6a206a0 100644
--- a/pkg/firmware-rpi3/boot-rpi3.files
+++ b/pkg/firmware-rpi3/boot-rpi3.files
@@ -1,169 +1,9 @@
-dir overlays 0775 0 0
-file overlays/spi0-cs.dtbo 0664 0 0
-file overlays/vc4-kms-kippah-7inch.dtbo 0664 0 0
-file overlays/rra-digidac1-wm8741-audio.dtbo 0664 0 0
-file overlays/rotary-encoder.dtbo 0664 0 0
-file overlays/spi-gpio35-39.dtbo 0664 0 0
-file overlays/rpi-dac.dtbo 0664 0 0
-file overlays/rpi-display.dtbo 0664 0 0
-file overlays/audioinjector-ultra.dtbo 0664 0 0
-file overlays/gpio-no-irq.dtbo 0664 0 0
-file overlays/i2c-bcm2708.dtbo 0664 0 0
-file overlays/hy28b-2017.dtbo 0664 0 0
-file overlays/ads7846.dtbo 0664 0 0
-file overlays/rpi-backlight.dtbo 0664 0 0
-file overlays/pitft35-resistive.dtbo 0664 0 0
-file overlays/exc3000.dtbo 0664 0 0
-file overlays/w1-gpio.dtbo 0664 0 0
-file overlays/i2c-gpio.dtbo 0664 0 0
-file overlays/w1-gpio-pullup.dtbo 0664 0 0
-file overlays/sc16is750-i2c.dtbo 0664 0 0
-file overlays/vc4-fkms-v3d.dtbo 0664 0 0
-file overlays/vga666.dtbo 0664 0 0
-file overlays/adv728x-m.dtbo 0664 0 0
-file overlays/audremap.dtbo 0664 0 0
-file overlays/allo-katana-dac-audio.dtbo 0664 0 0
-file overlays/gpio-no-bank0-irq.dtbo 0664 0 0
-file overlays/sc16is752-i2c.dtbo 0664 0 0
-file overlays/gpio-shutdown.dtbo 0664 0 0
-file overlays/adau1977-adc.dtbo 0664 0 0
-file overlays/pitft22.dtbo 0664 0 0
-file overlays/gpio-poweroff.dtbo 0664 0 0
-file overlays/spi1-2cs.dtbo 0664 0 0
-file overlays/mbed-dac.dtbo 0664 0 0
-file overlays/uart1.dtbo 0664 0 0
-file overlays/hy28b.dtbo 0664 0 0
-file overlays/smi-nand.dtbo 0664 0 0
-file overlays/hifiberry-amp.dtbo 0664 0 0
-file overlays/i2c-rtc.dtbo 0664 0 0
-file overlays/iqaudio-dac.dtbo 0664 0 0
-file overlays/wittypi.dtbo 0664 0 0
-file overlays/tc358743-audio.dtbo 0664 0 0
-file overlays/pps-gpio.dtbo 0664 0 0
-file overlays/akkordion-iqdacplus.dtbo 0664 0 0
-file overlays/rpi-cirrus-wm5102.dtbo 0664 0 0
-file overlays/sdio-1bit.dtbo 0664 0 0
-file overlays/justboom-dac.dtbo 0664 0 0
-file overlays/gpio-ir-tx.dtbo 0664 0 0
-file overlays/mcp23s17.dtbo 0664 0 0
-file overlays/rpi-tv.dtbo 0664 0 0
-file overlays/pi3-miniuart-bt.dtbo 0664 0 0
-file overlays/pi3-act-led.dtbo 0664 0 0
-file overlays/uart0.dtbo 0664 0 0
-file overlays/i2c-mux.dtbo 0664 0 0
-file overlays/pi3-disable-wifi.dtbo 0664 0 0
-file overlays/pi3-disable-bt.dtbo 0664 0 0
-file overlays/pwm-ir-tx.dtbo 0664 0 0
-file overlays/iqaudio-dacplus.dtbo 0664 0 0
-file overlays/ltc294x.dtbo 0664 0 0
-file overlays/gpio-ir.dtbo 0664 0 0
-file overlays/i2c-rtc-gpio.dtbo 0664 0 0
-file overlays/ads1015.dtbo 0664 0 0
-file overlays/papirus.dtbo 0664 0 0
-file overlays/rpi-poe.dtbo 0664 0 0
-file overlays/sc16is752-spi1.dtbo 0664 0 0
-file overlays/dionaudio-loco.dtbo 0664 0 0
-file overlays/README 0664 0 0
-file overlays/superaudioboard.dtbo 0664 0 0
-file overlays/piscreen.dtbo 0664 0 0
-file overlays/i2c-pwm-pca9685a.dtbo 0664 0 0
-file overlays/mcp23017.dtbo 0664 0 0
-file overlays/gpio-key.dtbo 0664 0 0
-file overlays/midi-uart0.dtbo 0664 0 0
-file overlays/mcp3202.dtbo 0664 0 0
-file overlays/sdio.dtbo 0664 0 0
-file overlays/spi2-2cs.dtbo 0664 0 0
-file overlays/qca7000.dtbo 0664 0 0
-file overlays/at86rf233.dtbo 0664 0 0
-file overlays/spi1-3cs.dtbo 0664 0 0
-file overlays/i2c1-bcm2708.dtbo 0664 0 0
-file overlays/mpu6050.dtbo 0664 0 0
-file overlays/midi-uart1.dtbo 0664 0 0
-file overlays/sdtweak.dtbo 0664 0 0
-file overlays/dionaudio-loco-v2.dtbo 0664 0 0
-file overlays/upstream.dtbo 0664 0 0
-file overlays/justboom-digi.dtbo 0664 0 0
-file overlays/audioinjector-wm8731-audio.dtbo 0664 0 0
-file overlays/enc28j60-spi2.dtbo 0664 0 0
-file overlays/dpi18.dtbo 0664 0 0
-file overlays/ads1115.dtbo 0664 0 0
-file overlays/enc28j60.dtbo 0664 0 0
-file overlays/mcp2515-can0.dtbo 0664 0 0
-file overlays/dpi24.dtbo 0664 0 0
-file overlays/dht11.dtbo 0664 0 0
-file overlays/smi.dtbo 0664 0 0
-file overlays/spi2-3cs.dtbo 0664 0 0
-file overlays/smi-dev.dtbo 0664 0 0
-file overlays/media-center.dtbo 0664 0 0
-file overlays/adv7282m.dtbo 0664 0 0
-file overlays/piscreen2r.dtbo 0664 0 0
-file overlays/sdhost.dtbo 0664 0 0
-file overlays/ov5647.dtbo 0664 0 0
-file overlays/spi-rtc.dtbo 0664 0 0
-file overlays/lirc-rpi.dtbo 0664 0 0
-file overlays/spi0-hw-cs.dtbo 0664 0 0
-file overlays/vc4-kms-v3d.dtbo 0664 0 0
-file overlays/rpi-ft5406.dtbo 0664 0 0
-file overlays/mz61581.dtbo 0664 0 0
-file overlays/mmc.dtbo 0664 0 0
-file overlays/hifiberry-dac.dtbo 0664 0 0
-file overlays/i2s-gpio28-31.dtbo 0664 0 0
-file overlays/i2c-sensor.dtbo 0664 0 0
-file overlays/allo-piano-dac-plus-pcm512x-audio.dtbo 0664 0 0
-file overlays/upstream-aux-interrupt.dtbo 0664 0 0
-file overlays/i2c0-bcm2708.dtbo 0664 0 0
-file overlays/balena-fin.dtbo 0664 0 0
-file overlays/mcp3008.dtbo 0664 0 0
-file overlays/tinylcd35.dtbo 0664 0 0
-file overlays/pitft28-resistive.dtbo 0664 0 0
-file overlays/hd44780-lcd.dtbo 0664 0 0
-file overlays/allo-boss-dac-pcm512x-audio.dtbo 0664 0 0
-file overlays/sx150x.dtbo 0664 0 0
-file overlays/pisound.dtbo 0664 0 0
-file overlays/allo-piano-dac-pcm512x-audio.dtbo 0664 0 0
-file overlays/dwc2.dtbo 0664 0 0
-file overlays/hy28a.dtbo 0664 0 0
-file overlays/jedec-spi-nor.dtbo 0664 0 0
-file overlays/hifiberry-digi.dtbo 0664 0 0
-file overlays/pibell.dtbo 0664 0 0
-file overlays/spi2-1cs.dtbo 0664 0 0
-file overlays/audioinjector-addons.dtbo 0664 0 0
-file overlays/rpi-proto.dtbo 0664 0 0
-file overlays/goodix.dtbo 0664 0 0
-file overlays/gpio-fan.dtbo 0664 0 0
-file overlays/bmp085_i2c-sensor.dtbo 0664 0 0
-file overlays/hifiberry-digi-pro.dtbo 0664 0 0
-file overlays/spi1-1cs.dtbo 0664 0 0
-file overlays/pwm.dtbo 0664 0 0
-file overlays/dwc-otg.dtbo 0664 0 0
-file overlays/adau7002-simple.dtbo 0664 0 0
-file overlays/pitft28-capacitive.dtbo 0664 0 0
-file overlays/pwm-2chan.dtbo 0664 0 0
-file overlays/tc358743.dtbo 0664 0 0
-file overlays/googlevoicehat-soundcard.dtbo 0664 0 0
-file overlays/fe-pi-audio.dtbo 0664 0 0
-file overlays/applepi-dac.dtbo 0664 0 0
-file overlays/rpi-sense.dtbo 0664 0 0
-file overlays/hifiberry-dacplus.dtbo 0664 0 0
-file overlays/iqaudio-digi-wm8804-audio.dtbo 0664 0 0
-file overlays/mcp2515-can1.dtbo 0664 0 0
-file overlays/allo-digione.dtbo 0664 0 0
 file fixup_cd.dat 0664 0 0
 file LICENCE.broadcom 0664 0 0
-file bcm2708-rpi-b-plus.dtb 0664 0 0
-file bcm2710-rpi-3-b-plus.dtb 0664 0 0
-file start_db.elf 0664 0 0
-file bcm2708-rpi-cm.dtb 0664 0 0
-file bcm2709-rpi-2-b.dtb 0664 0 0
 file start.elf 0664 0 0
 file bootcode.bin 0664 0 0
 file fixup_x.dat 0664 0 0
 file start_cd.elf 0664 0 0
 file fixup.dat 0664 0 0
 file config.txt 0664 0 0
-file bcm2708-rpi-b.dtb 0664 0 0
-file bcm2708-rpi-0-w.dtb 0664 0 0
 file start_x.elf 0664 0 0
-file fixup_db.dat 0664 0 0
-file bcm2710-rpi-3-b.dtb 0664 0 0
-file bcm2710-rpi-cm3.dtb 0664 0 0
diff --git a/pkg/firmware-rpi3/build b/pkg/firmware-rpi3/build
index 08deaf8..dfcd8b8 100755
--- a/pkg/firmware-rpi3/build
+++ b/pkg/firmware-rpi3/build
@@ -4,7 +4,7 @@ TARBALL="${VERSION}.tar.gz"
 URL="https://github.com/raspberrypi/firmware/archive"
 SHA256SUM="6b6db5f15c400bc1224266fd44238dd9b2479fd09f8a55e36ccdac2120632f8f"
 DEPENDS="toolchain"
-SUBPKG="boot-rpi3 firmware-rpi3 firmware-rpi3-dev"
+SUBPKG="boot-rpi3 boot-rpi3-dtbo firmware-rpi3 firmware-rpi3-dev boot-rpi3-dtb"
 
 prepare() {
 	return
diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build
index d2bd6e2..7472393 100755
--- a/pkg/release-rpi3/build
+++ b/pkg/release-rpi3/build
@@ -1,4 +1,4 @@
-DEPENDS="rootfs boot-rpi3 linux"
+DEPENDS="rootfs boot-rpi3 boot-rpi3-dtbo boot-rpi3-dtb linux"
 SUBPKG="release"
 
 build() {