diff --git a/iproute2-3.17.0.tar.sign b/iproute2-3.17.0.tar.sign
deleted file mode 100644
index 83346bb..0000000
Binary files a/iproute2-3.17.0.tar.sign and /dev/null differ
diff --git a/iproute2-3.17.0.tar.xz b/iproute2-3.17.0.tar.xz
deleted file mode 100644
index bae7fa2..0000000
--- a/iproute2-3.17.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09e406636e7598e46d5d4f7b928bf5db57049d65dbeb9a496005957ee16f6000
-size 440188
diff --git a/iproute2-3.18.0.tar.sign b/iproute2-3.18.0.tar.sign
new file mode 100644
index 0000000..4e1502a
Binary files /dev/null and b/iproute2-3.18.0.tar.sign differ
diff --git a/iproute2-3.18.0.tar.xz b/iproute2-3.18.0.tar.xz
new file mode 100644
index 0000000..188721e
--- /dev/null
+++ b/iproute2-3.18.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5a182154abd0749b1df7d1649115a32c65f559951477396203b1f514dbff1df
+size 448396
diff --git a/iproute2-HZ.diff b/iproute2-HZ.diff
index 1820022..1e3223c 100644
--- a/iproute2-HZ.diff
+++ b/iproute2-HZ.diff
@@ -2,13 +2,13 @@
  lib/utils.c |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-Index: iproute2-3.4.0/lib/utils.c
+Index: iproute2-3.18.0/lib/utils.c
 ===================================================================
---- iproute2-3.4.0.orig/lib/utils.c
-+++ iproute2-3.4.0/lib/utils.c
-@@ -30,6 +30,10 @@
+--- iproute2-3.18.0.orig/lib/utils.c
++++ iproute2-3.18.0/lib/utils.c
+@@ -34,6 +34,10 @@
  
- #include "utils.h"
+ int timestamp_short = 0;
  
 +#ifndef HZ
 +#define HZ sysconf(_SC_CLK_TCK)
@@ -17,7 +17,7 @@ Index: iproute2-3.4.0/lib/utils.c
  int get_integer(int *val, const char *arg, int base)
  {
  	long res;
-@@ -453,8 +457,8 @@ int matches(const char *cmd, const char
+@@ -558,8 +562,8 @@ int matches(const char *cmd, const char
  
  int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
  {
diff --git a/iproute2-doc.spec b/iproute2-doc.spec
index ae836fd..9245fea 100644
--- a/iproute2-doc.spec
+++ b/iproute2-doc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2-doc
 #
-# 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,9 +17,9 @@
 
 
 Name:           iproute2-doc
-Version:        3.17
+Version:        3.18
 Release:        0
-%define rversion 3.17.0
+%define rversion 3.18.0
 Summary:        Documentation to iproute2
 License:        GPL-2.0+
 Group:          Documentation/Other
diff --git a/iproute2.changes b/iproute2.changes
index 11487b8..3361f76 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jan  7 09:11:03 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 3.18
+* Support for configuring bridges (replacing brctl)
+* Human readable output for `ip -s link` (ip -s -h link)
+* Permit filtering `ip monitor` events by device per "dev NAME".
+* Permit filtering `ip link` output by device per "master NAME",
+  and by type per `type T` (e.g. type vlan).
+* Permit filtering `ip addr` output by flags like "tentative" and
+  "-tentative".
+
 -------------------------------------------------------------------
 Tue Nov 25 08:18:52 UTC 2014 - mkubecek@suse.cz
 
diff --git a/iproute2.spec b/iproute2.spec
index fa7d044..ff85b26 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package iproute2
 #
-# 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,9 +17,9 @@
 
 
 Name:           iproute2
-Version:        3.17
+Version:        3.18
 Release:        0
-%define rversion 3.17.0
+%define rversion 3.18.0
 Summary:        Linux network configuration utilities
 License:        GPL-2.0
 Group:          Productivity/Networking/Routing