diff --git a/ethtool-3.16.tar.sign b/ethtool-3.16.tar.sign
deleted file mode 100644
index ee6bc2c..0000000
--- a/ethtool-3.16.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIVAwUAVB9Z0+e/yOyVhhEJAQr1wA//aOKmTBmGa/z7QFAaigWswLsJ2+muWowa
-vPG1Yx602p84HS3OB2JuSeGq3MlyDQnbfDVkxuJ/cRbJNmK+HCzp9HNkIKoKMav7
-qGQoCqfA7OsVFzLFnj9UESU8vdshrLMlBOI/H8h1gnFL1x9HpL1iXNZw6nrsZ6Zl
-u5UOw/Zr+sCrvrN4GJGZaY/yNunvJonHQOv6/CaBRdVaptov9O2R5yzfElgUqdRI
-Goh57hdTyaEdVHrnA9tjRPUd9sZWn5WKlT43ZK+n2kyJHwDVIY/dx4JwKa3JJIxz
-02lkE1Np7ZvjszV2JTVifSxPWfDhemdq1wD59wuuxr/ir475dvJN8yQl35IpEqRP
-6nulM4NgNf4d3hySFWpCVGOwm/G+yfEzx+ADJSNp+KE5k9JqUJsqOKao+RivKT8W
-mTP5lgJZZSKVyRVD08c8dBgzWyTvjOszreU+hui966HOAIwMaPs36jmAKQd0laBH
-rAB/kwFeqPicYJnYW/Bxi+y6HGu0cHy9AySe8h2c2TKDbINgpKoYd/hmS4p+rqKu
-ubtBzAKdJZN3D6/Eg79+7TQ6NalvvFZeejcvInJfVbCdqQnYJ8tW9Wr9foJ1B2qk
-vJ1xBxhhbTkwBuREhNp7lmOmlRV1KShdmw6yfBDS7CMPxD1IQXPUr+ium6RH9xbe
-PgSjrKh3Nn0=
-=0Juz
------END PGP SIGNATURE-----
diff --git a/ethtool-3.16.tar.xz b/ethtool-3.16.tar.xz
deleted file mode 100644
index b55a875..0000000
--- a/ethtool-3.16.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6e0dd3fa904c3ad87487c66a4a8fde1ebc4194979ca5755df4b2efb247ca286
-size 198760
diff --git a/ethtool-3.18.tar.sign b/ethtool-3.18.tar.sign
new file mode 100644
index 0000000..18e3850
--- /dev/null
+++ b/ethtool-3.18.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIVAwUAVI3mCue/yOyVhhEJAQovZg//UwRWZRreT4zgdJCDpwM0NnA6FmVgC0/r
+7l4hc1r8WiI0Vuar1hdUUGjf6aPzPt60d2ub2AowgTJY5mzyN+rxDU9e4Rzc9Ca1
+xEk7xIQnDu3cWaj6QFtaZfkzjNUEAnfTU/FY9WFKy76dJxTQ2yZ7UXmwnAVo+02d
+2SqFhLhWXf/lONrKZ2GhfRdZXVm+YpEkIZ7Z9WlB397j9+/a7g8PrRryfJsibkgF
+DK+ZAwWs31B/lVOMrwTLzjIvvsiHdnWEPEN4SD/egUjlUWbnb/4dgVTT3YAGBgHo
+KQ0aicodT9ynjSza/npQr/UCrSJqeL0wvJGSW6p8s0DQOi41su14BDyZ+ij5DMoN
+UehI7jE7SV5XijProd4IfSrypcLvHS1Q/oRBwSV7guZ2LFehEzCjmQyJrdsHdkYr
+R+IdkTmXWnenoLzCVlINB2kS9WUpYnmTonc+PaHWZ2y06haLuO6nRyu6sYSqw9ap
+LfJO9/XkQNgfrk3AOfWZ4r+LWxOTJQ/D3kqhqVb4lmqjsgPeETOEaTr++6S0eKeK
+uVN/Ikdpn+6phDCtZjAN94LkFs1tO0CdflkInrqUEElC3v01KyZFQkQkblDdVZir
+sIa2jEcYyR4yD5VppEZISAdK3U3wneQKG3UEfM5auSqcOGwuKYjaIAjMSEiZwZ++
+2x7eZy1loGg=
+=YX3v
+-----END PGP SIGNATURE-----
diff --git a/ethtool-3.18.tar.xz b/ethtool-3.18.tar.xz
new file mode 100644
index 0000000..4f253ca
--- /dev/null
+++ b/ethtool-3.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:813ffe59fddd2db423c578448b10e33e2e2d4cc2ba780f1f0c603642b20342f6
+size 198780
diff --git a/ethtool.changes b/ethtool.changes
index f02e7fe..6fa2e15 100644
--- a/ethtool.changes
+++ b/ethtool.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jan 11 16:43:01 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 3.18
+* Fix: Lookup of SFP Tx bias in SFF-8472 module diagnostics
+  (-m option)
+- Drop usrmerge compat symlinks
+
 -------------------------------------------------------------------
 Tue Nov 18 09:41:08 UTC 2014 - jengelh@inai.de
 
diff --git a/ethtool.spec b/ethtool.spec
index 23f0688..5d7da73 100644
--- a/ethtool.spec
+++ b/ethtool.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ethtool
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           ethtool
-Version:        3.16
+Version:        3.18
 Release:        0
 Summary:        Examine and Tune Ethernet-Based Network Interfaces
 License:        GPL-2.0
@@ -44,16 +44,9 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR="%buildroot"
-#UsrMerge
-mkdir %buildroot/sbin
-ln -sf %_sbindir/ethtool  %buildroot/sbin
-#EndUserMerge
 
 %files
 %defattr(-,root,root)
-#UsrMerge
-/sbin/ethtool
-#EndUserMerge
 %_sbindir/ethtool
 %_mandir/man8/ethtool.8*
 %doc AUTHORS COPYING NEWS