diff --git a/_servicedata b/_servicedata
index 17b7e67..7fa908d 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param>
-          <param name="changesrevision">7518922bd5b98b137af7aaf3c836f5a498e91609</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">d1147327232ec4616a66ab898df84f9700c816c1</param></service></servicedata>
\ No newline at end of file
diff --git a/kernel-firmware-20180525.tar.xz b/kernel-firmware-20180525.tar.xz
deleted file mode 100644
index eb1879f..0000000
--- a/kernel-firmware-20180525.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5424af18b7f1421e38af181ba8cb5c1d5377b428b767a6ce0254099c988e744
-size 71261996
diff --git a/kernel-firmware-20180606.tar.xz b/kernel-firmware-20180606.tar.xz
new file mode 100644
index 0000000..325eeed
--- /dev/null
+++ b/kernel-firmware-20180606.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e50920ac452df1bec9369140402446ebc853ca5faf6fdd274d22cd1aeccd8d8
+size 72002984
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 1c2e8ca..d97193f 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,8 +1,31 @@
+-------------------------------------------------------------------
+Fri Jun  8 09:22:19 UTC 2018 - mpluskal@suse.com
+
+- Update to version 20180606:
+  * brcm: update firmware for bcm4356 pcie
+  * brcm: update firmware for bcm4354 sdio
+  * brcm: update firmware for bcm43362 sdio
+  * brcm: update firmware for bcm43340 sdio
+  * brcm: update firmware for bcm43430 sdio
+  * Update Cypress license termination clause
+  * amdgpu: update vega10 VCE firmware to version 55.3
+  * linux-firmware: Update firmware patch for Intel Bluetooth 7265 (D0)
+  * linux-firmware:Update firmware patch for Intel Bluetooth 7265 (D1)
+  * qcom: add venus firmware files for v5.2
+  * linux-firmware: liquidio: update vswitch firmware to v1.7.2
+
+-------------------------------------------------------------------
+Mon Jun  4 16:31:07 CEST 2018 - tiwai@suse.de
+
+- Use the upstream version of AMD ucode for family 17h
+  (CVE-2017-5715, bsc#1095735)
+
 -------------------------------------------------------------------
 Tue May 29 07:33:36 UTC 2018 - mpluskal@suse.com
 
 - Update to version 20180525:
-  * Update AMD cpu microcode for family 15h
+  * Update AMD cpu microcode for family 15h (CVE-2017-5715,
+    bsc#1095735)
   * linux-firmware: Update firmware patch for Intel Bluetooth 8260
   * qed: Add firmware 8.37.2.0
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index d626bce..ca2cb7b 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -17,9 +17,9 @@
 
 
 %define __ksyms_path ^/lib/firmware
-%define version_unconverted 20180525
+%define version_unconverted 20180606
 Name:           kernel-firmware
-Version:        20180525
+Version:        20180606
 Release:        0
 Summary:        Linux kernel firmware files
 License:        SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT
@@ -37,8 +37,6 @@ Source8:        ql2600_fw.bin
 Source9:        ql2700_fw.bin
 Source10:       ql8300_fw.bin
 Source99:       %{name}-rpmlintrc
-# CVE-2017-5715
-Source200:      microcode_amd_fam17h.bin
 BuildRequires:  fdupes
 BuildRequires:  suse-module-tools
 Requires(post): coreutils
@@ -105,8 +103,6 @@ sed -i "s|%{_bindir}/python$|%{_bindir}/python3|" ./check_whence.py
 mkdir -p %{buildroot}/lib/firmware
 cp -avf * %{buildroot}/lib/firmware
 rm -f %{buildroot}/lib/firmware/WHENCE
-# CVE-2017-5715 fix
-cp %{SOURCE200} %{buildroot}/lib/firmware/amd-ucode/
 %fdupes %{buildroot}
 # In alsa-firmware
 rm -f %{buildroot}/lib/firmware/ctefx.bin
diff --git a/microcode_amd_fam17h.bin b/microcode_amd_fam17h.bin
deleted file mode 100644
index 1ce229b..0000000
Binary files a/microcode_amd_fam17h.bin and /dev/null differ