diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec
index c592fe3a..f381cc20 100644
--- a/SPECS/linux-firmware.spec
+++ b/SPECS/linux-firmware.spec
@@ -1,23 +1,18 @@
-# global checkout 710963fe
-%global firmware_release 101
+%global debug_package %{nil}
+%global firmware_release 106
 
 %global _firmwarepath	/usr/lib/firmware
 %define _binaries_in_noarch_packages_terminate_build 0
 
 Name:		linux-firmware
-Version:	20190815
+Version:	20200316
 Release:	%{firmware_release}%{?dist}
 Summary:	Firmware files used by the Linux kernel
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 URL:		http://www.kernel.org/
 BuildArch:	noarch
 
-# We use upstream tarballs now.  Leave this in case we need to do a git
-# snapshot for some reason to remind us how they were generated.
-# git archive --format=tar --prefix=linux-firmware-%{checkout}/ %{checkout}  | xz > linux-firmware-%{version}.tar.xz
-#Source0:	%{name}-%{version}.tar.xz
 Source0:	https://www.kernel.org/pub/linux/kernel/firmware/%{name}-%{version}.tar.xz
-Source1:	navi-fw.tar.xz
 
 Patch1:		0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch
 Patch2:		0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch
@@ -36,7 +31,7 @@ Obsoletes:	rt61pci-firmware < 1.2-11
 Obsoletes:	rt73usb-firmware < 1.8-11
 Obsoletes:	cx18-firmware < 20080628-10
 Conflicts:	microcode_ctl < 2.1-0
-BuildRequires:	git-core
+BuildRequires:	git-core make
 
 %description
 This package includes firmware files required for some devices to
@@ -292,8 +287,6 @@ Firmware for Netronome Smart NICs
 %prep
 %setup -q
 
-tar -xvf %{SOURCE1}
-
 git init .
 if [ -z "$GIT_COMMITTER_NAME" ]; then
     git config user.email "nobody@fedoraproject.org"
@@ -305,6 +298,14 @@ git commit -m init .
 git am %{patches}
 
 %build
+
+%install
+mkdir -p %{buildroot}/%{_firmwarepath}
+mkdir -p %{buildroot}/%{_firmwarepath}/updates
+make DESTDIR=%{buildroot}/ FIRMWAREDIR=%{_firmwarepath} install
+
+#Cleanup files we don't want to ship
+pushd %{buildroot}/%{_firmwarepath}
 # Remove firmware shipped in separate packages already
 # Perhaps these should be built as subpackages of linux-firmware?
 rm -rf ess korg sb16 yamaha
@@ -330,11 +331,9 @@ rm -f ctefx.bin ctspeq.bin
 # Remove superfluous infra files
 rm -f check_whence.py configure Makefile README
 
-%install
-mkdir -p %{buildroot}/%{_firmwarepath}
-mkdir -p %{buildroot}/%{_firmwarepath}/updates
-cp -r * %{buildroot}/%{_firmwarepath}
-rm %{buildroot}/%{_firmwarepath}/{GPL*,WHENCE,LICENCE.*,LICENSE.*}
+# Remove executable bits from random firmware
+find . -type f -executable -exec chmod -x {} \;
+popd
 
 # Create file list but exclude firmwares that we place in subpackages
 FILEDIR=`pwd`
@@ -466,6 +465,46 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/netronome/*
 
 %changelog
+* Mon Mar 16 2020 Peter Robinson <pbrobinson@fedoraproject.org> 20200316-106
+- Update to upstream 20200316 release
+- Bluetooth firmware updates: Intel, QCom, RTL8822C
+- Agilio SmartNIC flower firmware to rev AOTC-2.12.A.13
+- amdgpu: Update to raven2, renoir, navi10, vega10, vega12, vega20
+- Intel i915: HuC, DMC firmware updates
+- nvidia: add TU116/117 signed firmware
+- amlogic: video decoder firmware updates
+- rtl_nic: update firmware for RTL8153A
+
+* Wed Jan 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> 20200122-105
+- Update to upstream 20200122 release
+- Intel bluetooth updates: AX200/AX201/9560
+- nvidia: TU102/TU104/TU106 signed firmware
+- AMD: update navi10/14, radeon, vega10/12/20, picasso, raven firmware
+- qed, mediatek, Mellanox updates
+- QCom SDM845 WLAN firmware
+- ath10k: updates for WCN3990, QCA9984, QCA988X, QCA9888, QCA9887, QCA6174
+- Update AMD cpu microcode for processor family 17h
+
+* Mon Dec 16 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20191215-104
+- Update to upstream 20191215 release
+- qcom: Add SDM845 firmwares for modem, Audio DSP, Compute DSP
+- Realtek firmwares for RTL8153, RTL8822CU, RTL8168fp/RTL8117, rtw88
+- Storage firmwares for mlxsw, cxgb4, QL4xxxx, bnx2x
+- amdgpu: raven/navi14/navi10 , i915
+- NXP Management Complex: LS108x, LS208x, LX2160.
+- Raspberry Pi 4 WiFi NVRAM
+
+* Tue Oct 22 2019 Josh Boyer <jwboyer@fedoraproject.org> 20191022-103
+- Rework to use upstream install
+
+* Mon Sep 23 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190923-102
+- Update Intel WiFi and Bluetooth firmwares
+- Mellanox new mlxsw_spectrum firmware 13.2000.1886
+- Some new Broadcom NVRAM for new devices
+- Firmware rtl8125a-3 for Realtek's 2.5Gbps chip RTL8125
+- Updated nvidia tegra firmwares
+- Updated i915, QCom Adreno a630, amdgpu Navi10 firmware
+
 * Thu Aug 15 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190815-101
 - Updates for various ath10k and rtw88 Wireless firmwares
 - Update NXP Layerscape Management Complex firmware