diff --git a/packages/linux-drivers/brcmap6xxx-aml/config/config.txt b/packages/linux-drivers/brcmap6xxx-aml/config/config.txt
index e9c4460696..2722085821 100644
--- a/packages/linux-drivers/brcmap6xxx-aml/config/config.txt
+++ b/packages/linux-drivers/brcmap6xxx-aml/config/config.txt
@@ -3,6 +3,7 @@ ccode=CN
 regrev=38
 mimo_bw_cap=1
 PM=0
-nv_by_chip=2 \
+nv_by_chip=3 \
+17221 6 nvram_ap6255.txt \
 17200 4 nvram_ap6330.txt \
 17209 1 nvram_ap6335.txt
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-aml/udev.d/80-brcmfmac_sdio.rules b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/udev.d/80-brcmfmac_sdio.rules
index 00c66eb4a2..bd06442be6 100644
--- a/packages/linux-firmware/brcmfmac_sdio-firmware-aml/udev.d/80-brcmfmac_sdio.rules
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware-aml/udev.d/80-brcmfmac_sdio.rules
@@ -6,6 +6,7 @@ ACTION!="add", GOTO="end"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa962", GOTO="begin"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4330", GOTO="begin"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4335", GOTO="begin"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa9bf", GOTO="begin"
 GOTO="end"
 LABEL="begin"
 ### Broadcom bcm43362/bcm20710a1 bluetooth device
@@ -20,6 +21,10 @@ ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4330", \
 ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4335", \
   ENV{brcm_device}="bcm4335c0"
 
+### Broadcom bcm4345c0 bluetooth device
+ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa9bf", \
+  ENV{brcm_device}="bcm4345c0"
+
 ENV{brcm_device}=="bcm*", ACTION=="add", \
   TAG+="systemd", ENV{SYSTEMD_WANTS}+="brcmfmac_sdio-firmware@$env{brcm_device}.service"
 LABEL="end"
diff --git a/packages/linux-firmware/wlan-firmware-aml/package.mk b/packages/linux-firmware/wlan-firmware-aml/package.mk
index 7eafb056d3..8450033031 100644
--- a/packages/linux-firmware/wlan-firmware-aml/package.mk
+++ b/packages/linux-firmware/wlan-firmware-aml/package.mk
@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="wlan-firmware-aml"
-PKG_VERSION="b74369c"
+PKG_VERSION="5f5fae7"
 PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="http://openlinux.amlogic.com:8000/download/ARM/wifi/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/openwetek/wlan-firmware-aml/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="firmware"
 PKG_SHORTDESC="wlan-firmware-aml: Firmware for various WLAN chips used in the devices based on Amlogic SoCs"
@@ -37,10 +37,17 @@ make_target() {
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/firmware/brcm
 
+  # AP6255
+  cp -PR bcm_ampak/config/6255/fw_bcm43455c0_*.bin $INSTALL/usr/lib/firmware/brcm
+  cp -P bcm_ampak/config/6255/nvram.txt $INSTALL/usr/lib/firmware/brcm/nvram_ap6255.txt
+  cp -P bcm_ampak/config/6255/BT/BCM4345C0.hcd $INSTALL/usr/lib/firmware/brcm/bcm4345c0.hcd
+
+  # AP6330
   cp -PR bcm_ampak/config/AP6330/Wi-Fi/fw_bcm40183b2*.bin $INSTALL/usr/lib/firmware/brcm
   cp -P bcm_ampak/config/AP6330/Wi-Fi/nvram_ap6330.txt $INSTALL/usr/lib/firmware/brcm
   cp -P bcm_ampak/config/AP6330/BT/bcm40183b2.hcd $INSTALL/usr/lib/firmware/brcm
 
+  # AP6335
   cp -PR bcm_ampak/config/6335/fw_bcm4339a0_*.bin $INSTALL/usr/lib/firmware/brcm
   cp -P bcm_ampak/config/6335/nvram.txt $INSTALL/usr/lib/firmware/brcm/nvram_ap6335.txt
   cp -P bcm_ampak/config/6335/BT/bcm4335c0.hcd $INSTALL/usr/lib/firmware/brcm