diff --git a/.gitignore b/.gitignore
index 880bf3e..9c7de4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ linux-firmware-20100806.tar.bz2
 /linux-firmware-20160204.tar.gz
 /linux-firmware-20160316.tar.gz
 /linux-firmware-20160321.tar.gz
+/linux-firmware-20160505.tar.gz
diff --git a/linux-firmware.spec b/linux-firmware.spec
index feebc4f..e3e180c 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,10 +1,10 @@
-%global checkout 5f8ca0c
-%global firmware_release 63
+%global checkout 8afadbe5
+%global firmware_release 64
 
 %global _firmwarepath	/usr/lib/firmware
 
 Name:		linux-firmware
-Version:	20160321
+Version:	20160505
 Release:	%{firmware_release}.git%{checkout}%{?dist}
 Summary:	Firmware files used by the Linux kernel
 
@@ -411,6 +411,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.* LICENSE.*
 
 %changelog
+* Thu May 05 2016 Josh Boyer <jwboyer@fedoraproject.org> 20160505-64.git8afadbe5
+- Update to the latest upstream snapshot
+- AMD, intel, and QCA6xxx updates (rhbz 1294263)
+
 * Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> 20160321-63.git5f8ca0c
 - Update to latest upstream snapshot
 - New Skylake GuC and audio firmware, AMD ucode updates
diff --git a/sources b/sources
index 1c60f53..13084e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46a7ec26850851c9da93ba84dd14fc71  linux-firmware-20160321.tar.gz
+0146d8513427f3d7c994f9a6ed27aa02  linux-firmware-20160505.tar.gz