diff --git a/root/package/firmware/firmware-nonfree/Makefile b/root/package/firmware/firmware-nonfree/Makefile
new file mode 100644
index 00000000..86c9f760
--- /dev/null
+++ b/root/package/firmware/firmware-nonfree/Makefile
@@ -0,0 +1,28 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=firmware-nonfree
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/RPi-Distro/firmware-nonfree.git
+PKG_SOURCE_DATE:=2018-05-27
+PKG_SOURCE_VERSION:=86e88fbf0345da49555d0ec34c80b4fbae7d0cd3
+PKG_MIRROR_HASH:=bef9efe173b87e7afc37bb856f9727c4ff64a1ee1cbe6640d22bae79601553bb
+
+SCAN_DEPS = *.mk
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/firmware-default
+  SECTION:=firmware
+  CATEGORY:=Firmware
+  URL:=https://github.com/RPi-Distro/firmware-nonfree.git
+  TITLE:=$(1)
+endef
+
+define Build/Compile
+
+endef
+
+include $(wildcard ./*.mk)
+#$(eval $(call BuildPackage,firmware-nonfree))
diff --git a/root/package/firmware/firmware-nonfree/broadcom.mk b/root/package/firmware/firmware-nonfree/broadcom.mk
new file mode 100644
index 00000000..ef6bbbed
--- /dev/null
+++ b/root/package/firmware/firmware-nonfree/broadcom.mk
@@ -0,0 +1,10 @@
+Package/brcmfmac-firmware-43455-sdio = $(call Package/firmware-default,Broadcom BCM43455 FullMac SDIO firmware)
+define Package/brcmfmac-firmware-43455-sdio/install
+	$(INSTALL_DIR) $(1)/lib/firmware/brcm
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.bin \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.clm_blob \
+		$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.txt \
+		$(1)/lib/firmware/brcm/
+endef
+$(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio))
diff --git a/root/package/firmware/linux-firmware/broadcom.mk b/root/package/firmware/linux-firmware/broadcom.mk
deleted file mode 100644
index 24acac77..00000000
--- a/root/package/firmware/linux-firmware/broadcom.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-Package/brcmfmac-firmware-43602a1-pcie = $(call Package/firmware-default,Broadcom 43602a1 FullMAC PCIe firmware)
-define Package/brcmfmac-firmware-43602a1-pcie/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43602-pcie.ap.bin \
-		$(1)/lib/firmware/brcm/brcmfmac43602-pcie.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-43602a1-pcie))
-
-Package/brcmfmac-firmware-4366b1-pcie = $(call Package/firmware-default,Broadcom 4366b1 FullMAC PCIe firmware)
-define Package/brcmfmac-firmware-4366b1-pcie/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac4366b-pcie.bin \
-		$(1)/lib/firmware/brcm/
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-4366b1-pcie))
-
-Package/brcmfmac-firmware-4329-sdio = $(call Package/firmware-default,Broadcom BCM4329 FullMac SDIO firmware)
-define Package/brcmfmac-firmware-4329-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac4329-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac4329-sdio.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-4329-sdio))
-
-Package/brcmfmac-firmware-43362-sdio = $(call Package/firmware-default,Broadcom BCM43362 FullMac SDIO firmware)
-define Package/brcmfmac-firmware-43362-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43362-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac43362-sdio.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-43362-sdio))
-
-Package/brcmfmac-firmware-43430-sdio = $(call Package/firmware-default,Broadcom BCM43430 FullMac SDIO firmware)
-define Package/brcmfmac-firmware-43430-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43430-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac43430-sdio.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-43430-sdio))
-
-Package/brcmfmac-firmware-43455-sdio = $(call Package/firmware-default,Broadcom BCM43455 FullMac SDIO firmware)
-define Package/brcmfmac-firmware-43455-sdio/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43455-sdio.bin \
-		$(1)/lib/firmware/brcm/brcmfmac43455-sdio.bin
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-43455-sdio))
-
-Package/brcmfmac-firmware-usb = $(call Package/firmware-default,Broadcom BCM43xx fullmac USB firmware)
-define Package/brcmfmac-firmware-usb/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43236b.bin \
-		$(1)/lib/firmware/brcm/
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/brcm/brcmfmac43143.bin \
-		$(1)/lib/firmware/brcm/
-endef
-$(eval $(call BuildPackage,brcmfmac-firmware-usb))
-
-Package/brcmsmac-firmware = $(call Package/firmware-default,Broadcom BCM43xx softmac PCIe firmware)
-define Package/brcmsmac-firmware/install
-	$(INSTALL_DIR) $(1)/lib/firmware/brcm
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx-0.fw \
-		$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/bcm43xx_hdr-0.fw \
-		$(1)/lib/firmware/brcm/
-endef
-$(eval $(call BuildPackage,brcmsmac-firmware))
-
-Package/bnx2-firmware = $(call Package/firmware-default,Broadcom BCM5706/5708/5709/5716 firmware)
-define Package/bnx2-firmware/install
-	$(INSTALL_DIR) $(1)/lib/firmware/bnx2
-	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/bnx2/* \
-		$(1)/lib/firmware/bnx2/
-endef
-$(eval $(call BuildPackage,bnx2-firmware))