diff --git a/.gitignore b/.gitignore
index 04116a0..22c4e85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/linux-firmware-20180220.tar.gz
+SOURCES/linux-firmware-20180220.1.tar.gz
diff --git a/.linux-firmware.metadata b/.linux-firmware.metadata
index 2e9bba4..734f68c 100644
--- a/.linux-firmware.metadata
+++ b/.linux-firmware.metadata
@@ -1 +1 @@
-b0466b12f531a41ad17eb82cf599cee74a898bf6 SOURCES/linux-firmware-20180220.tar.gz
+fc212131c5240577022f636d6237c4d736081d9f SOURCES/linux-firmware-20180220.1.tar.gz
diff --git a/SOURCES/REDHAT-DISCLAIMER b/SOURCES/REDHAT-DISCLAIMER
deleted file mode 100644
index a42d5a1..0000000
--- a/SOURCES/REDHAT-DISCLAIMER
+++ /dev/null
@@ -1,13 +0,0 @@
-
- This update supersedes microcode provided  by Red Hat with the CVE-2017-5715 (“Spectre”)
- CPU branch injection vulnerability mitigation. (Historically, Red Hat has provided updated
- microcode, developed by our microprocessor partners, as a customer convenience.) Further
- testing has uncovered problems with the microcode provided along with the “Spectre” mitigation
- that could lead to system instabilities. As a result, Red Hat is providing an microcode update
- that reverts to the last known good microcode version dated before 03 January 2018.
- Red Hat strongly recommends that customers contact their hardware provider for the latest microcode updates.
-
- IMPORTANT: Customers using Intel Skylake-, Broadwell-, and Haswell-based platforms must obtain and
- install updated microcode from their hardware vendor immediately. The "Spectre" mitigation requires
- both an updated kernel from Red Hat and updated microcode from your hardware vendor.
-
diff --git a/SPECS/linux-firmware.spec b/SPECS/linux-firmware.spec
index f7aafc0..70cf68c 100644
--- a/SPECS/linux-firmware.spec
+++ b/SPECS/linux-firmware.spec
@@ -1,5 +1,6 @@
 %global checkout 6d51311
-%global firmware_release 62
+%global zrelease 1
+%global firmware_release 62.%{zrelease}
 
 Name:		linux-firmware
 Version:	20180220
@@ -9,8 +10,12 @@ Summary:	Firmware files used by the Linux kernel
 Group:		System Environment/Kernel
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 URL:		https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-# Source0 creation: "git archive --format=tar [gitid] | gzip > [srcdir]/%{name}-%{version}.tar.gz"
-Source0:	%{name}-%{version}.tar.gz
+# Source0 for zstream must be different from the ystream {version} only by the
+# files requested for update and the additional {zrelease} suffix. The easiest
+# way I found so far was to basically cherry-pick the changes made by the 
+# specific commit and manually copy/paste on the Source0 ystream {version} and
+# then repackaging it.
+Source0:	%{name}-%{version}.%{zrelease}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Provides:	kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
@@ -31,10 +36,6 @@ Obsoletes:	libertas-sd8686-firmware
 Obsoletes:	libertas-sd8787-firmware
 Obsoletes: 	libertas-usb8388-olpc-firmware
 
-# REDHAT-DISCLAIMER on u-code updates (rhbz 1533945)
-Requires(post): coreutils
-Source1: REDHAT-DISCLAIMER
-
 %define fwdir /usr/lib/firmware
 %define _binaries_in_noarch_packages_terminate_build   0
 
@@ -262,9 +263,6 @@ rm -rf vxge
 # Remove the check_whence.py file
 rm -f check_whence.py
 
-# REDHAT-DISCLAIMER on u-code updates
-install %{SOURCE1} ./
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{fwdir}
@@ -287,20 +285,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-# REDHAT-DISCLAIMER on u-code updates
-# send the message to syslog, so it gets recorded on /var/log
-if [ -e /usr/bin/logger ]; then
-	/usr/bin/logger -p syslog.notice -t DISCLAIMER -f %{fwdir}/REDHAT-DISCLAIMER
-fi
-# also paste it over dmesg (some customers drop dmesg messages while
-# others keep them into /var/log for the later case, we'll have the
-# disclaimer recorded twice into system logs.
-if [ -e /usr/bin/cat ]; then
-	/usr/bin/cat %{fwdir}/REDHAT-DISCLAIMER > /dev/kmsg
-fi
-
-
 %files -n iwl100-firmware
 %defattr(-,root,root,-)
 %doc WHENCE LICENCE.iwlwifi_firmware
@@ -402,6 +386,9 @@ fi
 %doc WHENCE LICENCE.* LICENSE.*
 
 %changelog
+* Tue May 22 2018 Bruno E. O. Meneguele <bmeneg@redhat.com> 20180220-62.1.git6d51311
+- amd: add microcode for family 17h and update for family 15h (rhbz 1576321)
+
 * Tue Feb 20 2018 Rafael Aquini <aquini@redhat.com> - 20180220-62.git6d51311
 - nfp: NIC stops transmitting for small MSS values when TSO is enabled (rhbz 1542263)
 - chelsio: pull in latests firmware 1.17.14.0 (rhbz 1538590)