diff --git a/buildroot-patches/0107-Bump-RPI-BT-Firmware-version-to-latest.patch b/buildroot-patches/0107-Bump-RPI-BT-Firmware-version-to-latest.patch
deleted file mode 100644
index 0d947019..00000000
--- a/buildroot-patches/0107-Bump-RPI-BT-Firmware-version-to-latest.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b7c3b4b1cbc21c15affbf2d7199e1fe8ca4c6162 Mon Sep 17 00:00:00 2001
-From: Peter Steenbergen <info@j1nx.nl>
-Date: Mon, 28 Oct 2019 15:48:48 +0100
-Subject: [PATCH 1/1] Bump RPI BT Firmware version to latest
-
----
- package/rpi-bt-firmware/rpi-bt-firmware.hash | 2 +-
- package/rpi-bt-firmware/rpi-bt-firmware.mk   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.hash b/package/rpi-bt-firmware/rpi-bt-firmware.hash
-index a3c7281d75..a9703150df 100644
---- a/package/rpi-bt-firmware/rpi-bt-firmware.hash
-+++ b/package/rpi-bt-firmware/rpi-bt-firmware.hash
-@@ -1,3 +1,3 @@
- # Locally computed
--sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626  rpi-bt-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
-+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a  rpi-bt-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
- sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx
-diff --git a/package/rpi-bt-firmware/rpi-bt-firmware.mk b/package/rpi-bt-firmware/rpi-bt-firmware.mk
-index 23923453c4..785f007cc3 100644
---- a/package/rpi-bt-firmware/rpi-bt-firmware.mk
-+++ b/package/rpi-bt-firmware/rpi-bt-firmware.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--RPI_BT_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
-+RPI_BT_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
- RPI_BT_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_BT_FIRMWARE_VERSION))
- RPI_BT_FIRMWARE_LICENSE = PROPRIETARY
- RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
--- 
-2.11.0
-
diff --git a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version-to-latest.patch b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch
similarity index 50%
rename from buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version-to-latest.patch
rename to buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch
index 4b67770e..2e972f3b 100644
--- a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version-to-latest.patch
+++ b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch
@@ -1,35 +1,44 @@
-From d4e129660fede6331859dd3c955dbcdff851d8c9 Mon Sep 17 00:00:00 2001
-From: Peter Steenbergen <info@j1nx.nl>
-Date: Mon, 28 Oct 2019 15:53:01 +0100
-Subject: [PATCH 1/1] Bump RPI Wifi Firmware version to latest
+From fa1d7e1ef1cc188a887717c70bf4312518caae2d Mon Sep 17 00:00:00 2001
+From: j1nx <p.steenbergen@j1nx.nl>
+Date: Mon, 1 Jun 2020 16:56:31 +0200
+Subject: [PATCH 1/1] Bump RPI Wifi Firmware version
 
 ---
  package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
- package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-index 5de9e0f13f..c1f9494577 100644
+index 5de9e0f13f..90aa03218f 100644
 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
 +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
 @@ -1,3 +1,3 @@
  # Locally calculated
 -sha256 51a33d23127300dffd6ac088f372b83ab862053f5e4dc7130676ebaaa824e626  rpi-wifi-firmware-688531da4bcf802a814d9cb0c8b6d62e3b8a3327.tar.gz
-+sha256 05db087504be2f6bc1d902cca605114c7f9d458be0adb3b8026369357a329f7a  rpi-wifi-firmware-d4f7087ecbc8eff9cb64a4650765697157821d64.tar.gz
++sha256 26e6e4aace9c9d1e9b9b1447f57ebd743dc15f3a337deac9e77d964885fcb3b3  rpi-wifi-firmware-00daf85ffa373ecce7836df7543c6ebe4cf43639.tar.gz
  sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx
 diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-index 9dd1854b9a..6be02509fe 100644
+index 9dd1854b9a..0c697bddbe 100644
 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
 +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-@@ -4,7 +4,7 @@
+@@ -4,14 +4,14 @@
  #
  ################################################################################
  
 -RPI_WIFI_FIRMWARE_VERSION = 688531da4bcf802a814d9cb0c8b6d62e3b8a3327
-+RPI_WIFI_FIRMWARE_VERSION = d4f7087ecbc8eff9cb64a4650765697157821d64
- RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
+-RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
++RPI_WIFI_FIRMWARE_VERSION = 00daf85ffa373ecce7836df7543c6ebe4cf43639
++RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
  RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
  RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
+ 
+ define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
+ 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
+-	$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
++	$(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm
+ endef
+ 
+ $(eval $(generic-package))
 -- 
-2.11.0
+2.20.1