diff --git a/BCM43430A1.hcd b/BCM43430A1.hcd
index b3c57e0..845563d 100644
--- a/BCM43430A1.hcd
+++ b/BCM43430A1.hcd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930
-size 36264
+oid sha256:c096ad4a5c3f06ed7d69eba246bf89ada9acba64a5b6f51b1e9c12f99bb1e1a7
+size 30049
diff --git a/BCM4345C0.hcd b/BCM4345C0.hcd
index 44f93db..5cfe9af 100644
--- a/BCM4345C0.hcd
+++ b/BCM4345C0.hcd
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:042a8c234beaa9abb8d6156430e44af983f861036e1d54ffe8cabcc0dab76a43
-size 59237
+oid sha256:3f6b79a28b181e8e7ec9b04ef430a48d1f74e07321d386330594815e13544e96
+size 57602
diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes
index 5b287a0..e8d0a89 100644
--- a/bcm43xx-firmware.changes
+++ b/bcm43xx-firmware.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Sep 15 07:23:29 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Update bluetooth firmware to address Sweyntooth and Spectra issues:
+  * BCM43430A1.hcd
+  * BCM4345C0.hcd
+
+-------------------------------------------------------------------
+Tue Sep 15 07:16:05 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Remove wildcards in %files
+
+-------------------------------------------------------------------
+Thu Aug 20 10:30:53 UTC 2020 - Matthias Brugger <mbrugger@suse.com>
+
+- Delete brcmfmac43362-sdio.cubietech,cubietruck.txt as now part of kernel-firmware
+
 -------------------------------------------------------------------
 Tue Jul 21 14:54:44 UTC 2020 - Matthias Brugger <mbrugger@suse.com>
 
diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec
index 767aa35..98b06db 100644
--- a/bcm43xx-firmware.spec
+++ b/bcm43xx-firmware.spec
@@ -36,7 +36,6 @@ Source301:      https://raw.githubusercontent.com/SolidRun/meta-solidrun-arm-imx
 #BCM4339
 Source391:      brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt
 #BCM43362
-Source3621:     http://dl.cubieboard.org/public/Cubieboard/benn/firmware/ap6210/nvram_ap6210.txt#/brcmfmac43362-sdio.cubietech,cubietruck.txt
 Source3622:     https://github.com/Bananian/bananian/raw/master/deb/u-boot-m2-bananian_armhf/lib/firmware/brcm/brcmfmac43362-sdio.txt#/brcmfmac43362-sdio.sinovoip,bpi-m2.txt
 #BCM43430
 Source4309:     https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd
@@ -73,7 +72,6 @@ mkdir -p %{buildroot}/lib/firmware/brcm
 install -c -m 0644 %{SOURCE291} %{buildroot}/lib/firmware/brcm/
 install -c -m 0644 %{SOURCE301} %{buildroot}/lib/firmware/brcm/
 install -c -m 0644 %{SOURCE391} %{buildroot}/lib/firmware/brcm/
-install -c -m 0644 %{SOURCE3621} %{buildroot}/lib/firmware/brcm/
 install -c -m 0644 %{SOURCE3622} %{buildroot}/lib/firmware/brcm/
 install -c -m 0644 %{SOURCE4356} %{buildroot}/lib/firmware/brcm/
 # Used by bluez (hciattach)
@@ -82,12 +80,12 @@ install -c -m 0644 %{SOURCE4559} %{buildroot}/lib/firmware/
 
 %files
 %license LICENCE.broadcom_bcm43xx LICENCE.cypress
-/lib/firmware/*.hcd
-/lib/firmware/brcm/*.txt
+/lib/firmware/BCM43430A1.hcd
+/lib/firmware/BCM4345C0.hcd
 /lib/firmware/brcm/brcmfmac4329-sdio.solidrun,cubox-i-dl.txt
 /lib/firmware/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.txt
 /lib/firmware/brcm/brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt
 /lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m2.txt
-/lib/firmware/brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+/lib/firmware/brcm/brcmfmac4356-pcie.txt
 
 %changelog
diff --git a/brcmfmac43362-sdio.cubietech,cubietruck.txt b/brcmfmac43362-sdio.cubietech,cubietruck.txt
deleted file mode 100644
index ac55a0c..0000000
--- a/brcmfmac43362-sdio.cubietech,cubietruck.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-#AP6210_NVRAM_V1.2_03192013
-manfid=0x2d0
-prodid=0x492
-vendid=0x14e4
-devid=0x4343
-boardtype=0x0598
-
-# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same
-#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305
-boardrev=0x1307
-boardnum=777
-xtalfreq=26000
-boardflags=0x80201
-boardflags2=0x80
-sromrev=3
-wl0id=0x431b
-macaddr=00:90:4c:07:71:12
-aa2g=1
-ag0=2
-maxp2ga0=74
-cck2gpo=0x2222
-ofdm2gpo=0x44444444
-mcs2gpo0=0x6666
-mcs2gpo1=0x6666
-pa0maxpwr=56
-
-#P207 PA params
-#pa0b0=5447
-#pa0b1=-658
-#pa0b2=-175<div></div>
-
-#Same PA params for P304,P305, P306, P307
-
-pa0b0=5447
-pa0b1=-607
-pa0b2=-160
-pa0itssit=62
-pa1itssit=62
-
-
-cckPwrOffset=5
-ccode=0
-rssismf2g=0xa
-rssismc2g=0x3
-rssisav2g=0x7
-triso2g=0
-noise_cal_enable_2g=0
-noise_cal_po_2g=0
-swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff
-temp_add=29767
-temp_mult=425
-
-btc_flags=0x6
-btc_params0=5000
-btc_params1=1000
-btc_params6=63
-