diff --git a/_servicedata b/_servicedata
index 62bf4e3..d84691b 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">8c1e439c967a50f0698d61aafdba3841aff10db0</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">b562d2f3583f19ecda22b08e514ced57dd1e5f4d</param></service></servicedata>
\ No newline at end of file
diff --git a/kernel-firmware-20180402.tar.xz b/kernel-firmware-20180402.tar.xz
deleted file mode 100644
index 40605ee..0000000
--- a/kernel-firmware-20180402.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c9586ebe3525f228ff7cbc0475151cbdc746173727fb042a776cb79c2b84232
-size 69733004
diff --git a/kernel-firmware-20180416.tar.xz b/kernel-firmware-20180416.tar.xz
new file mode 100644
index 0000000..bd66648
--- /dev/null
+++ b/kernel-firmware-20180416.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4db93928986e9a04ce87bc81c62f58d8e7f01b0ee9612412122815a05b9e6622
+size 70424104
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index b988145..77e2bc6 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Apr 17 16:17:21 UTC 2018 - mpluskal@suse.com
+
+- Update to version 20180416:
+  * linux-firmware: update wil6210 firmware to 5.2.0.18
+  * linux-firmware: rsi: update firmware images for Redpine 9113 chipset
+  * iwlwifi: update firmwares for 3160, 3168 and 7265
+  * iwlwifi: add some new FW versions and update older ones
+
+-------------------------------------------------------------------
+Fri Apr 13 14:31:33 UTC 2018 - meissner@suse.com
+
+- fixed new style modalias detection too for AMD CPUs in ucode-amd,
+  it can only use 1 : (bsc#1084687)
+
 -------------------------------------------------------------------
 Tue Apr  3 09:00:33 UTC 2018 - mpluskal@suse.com
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index f8c4485..f1f66a7 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -17,9 +17,9 @@
 
 
 %define __ksyms_path ^/lib/firmware
-%define version_unconverted 20180402
+%define version_unconverted 20180416
 Name:           kernel-firmware
-Version:        20180402
+Version:        20180416
 Release:        0
 Summary:        Linux kernel firmware files
 License:        SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT
@@ -85,7 +85,7 @@ Group:          System/Kernel
 Requires(post): coreutils
 Requires(postun): coreutils
 # new style (after 3.12 kernel somewhen)
-Supplements:    modalias(cpu:type:x86*ven0002*)
+Supplements:    modalias(cpu:type%%3Ax86*ven0002*)
 # old style (before 3.16 kernel)
 Supplements:    modalias(x86cpu:vendor%%3A0002%%3Afamily%%3A*%%3Amodel%%3A*%%3Afeature%%3A*)