diff --git a/buildroot-patches/0019-brcmfmac_sdio-firmware-update.patch b/buildroot-patches/0019-brcmfmac_sdio-firmware-update.patch
new file mode 100644
index 0000000000..10e01e8c68
--- /dev/null
+++ b/buildroot-patches/0019-brcmfmac_sdio-firmware-update.patch
@@ -0,0 +1,18 @@
+--- buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash.orig
++++ buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256  2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356  brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz
++sha256  02809dad206de1051226a58d1fb15f930bc2f19544bb2865893712250760067e  brcmfmac_sdio-firmware-rpi-4c1789eb8705336b956b3bf1a3e6e3359c0555e4.tar.gz
+ sha256  ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599  LICENSE
+--- buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk.orig
++++ buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5
++BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 4c1789eb8705336b956b3bf1a3e6e3359c0555e4
+ BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION))
+ BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY
+ BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENSE
diff --git a/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash
new file mode 100644
index 0000000000..db5c9c4211
--- /dev/null
+++ b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  02809dad206de1051226a58d1fb15f930bc2f19544bb2865893712250760067e  brcmfmac_sdio-firmware-rpi-4c1789eb8705336b956b3bf1a3e6e3359c0555e4.tar.gz
+sha256  ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599  LICENSE
diff --git a/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash.orig b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash.orig
new file mode 100644
index 0000000000..c20abfc26c
--- /dev/null
+++ b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.hash.orig
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256  2f0917b104739455dd488dd8f5af2ee4430801a7ac8fe8d9866e74bfbb185356  brcmfmac_sdio-firmware-rpi-26ff205b45dc109b498a70aaf182804ad9dbfea5.tar.gz
+sha256  ea8b7b7b6cfc6fd30587ed977100f6a542734ce53218b5b63de16180acddd599  LICENSE
diff --git a/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
new file mode 100644
index 0000000000..c3b9fa7eb8
--- /dev/null
+++ b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# brcmfmac_sdio-firmware-rpi
+#
+################################################################################
+
+BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 4c1789eb8705336b956b3bf1a3e6e3359c0555e4
+BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION))
+BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY
+BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y)
+define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT
+	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics
+	cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm
+	cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics
+	chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y)
+define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI
+	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress
+	cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
+	cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress
+	chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac*
+endef
+endif
+
+define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS
+	$(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT)
+	$(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI)
+endef
+
+$(eval $(generic-package))
diff --git a/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk.orig b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk.orig
new file mode 100644
index 0000000000..95707487a9
--- /dev/null
+++ b/buildroot-patches/0019-brcmfmac_sdio-firmware-update/buildroot/package/brcmfmac_sdio-firmware-rpi/brcmfmac_sdio-firmware-rpi.mk.orig
@@ -0,0 +1,35 @@
+################################################################################
+#
+# brcmfmac_sdio-firmware-rpi
+#
+################################################################################
+
+BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION = 26ff205b45dc109b498a70aaf182804ad9dbfea5
+BRCMFMAC_SDIO_FIRMWARE_RPI_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(BRCMFMAC_SDIO_FIRMWARE_RPI_VERSION))
+BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE = PROPRIETARY
+BRCMFMAC_SDIO_FIRMWARE_RPI_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_BT),y)
+define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT
+	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/synaptics
+	cp --remove-destination --no-dereference $(@D)/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/brcm
+	cp --remove-destination --no-dereference $(@D)/firmware/synaptics/*.hcd $(TARGET_DIR)/lib/firmware/synaptics
+	chmod 644 $(TARGET_DIR)/lib/firmware/brcm/*.hcd $(TARGET_DIR)/lib/firmware/synaptics/*.hcd
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI),y)
+define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI
+	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm $(TARGET_DIR)/lib/firmware/cypress
+	cp --remove-destination --no-dereference $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
+	cp --remove-destination --no-dereference $(@D)/firmware/cypress/cyfmac* $(TARGET_DIR)/lib/firmware/cypress
+	chmod 644 $(TARGET_DIR)/lib/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/cypress/cyfmac*
+endef
+endif
+
+define BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_CMDS
+	$(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_BT)
+	$(BRCMFMAC_SDIO_FIRMWARE_RPI_INSTALL_TARGET_WIFI)
+endef
+
+$(eval $(generic-package))