diff --git a/ipset-6.17.tar.xz b/ipset-6.17.tar.xz
deleted file mode 100644
index 88ae1ad..0000000
--- a/ipset-6.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2940f45dce68a79ea0295e4ce487902367ca334c661f208cd745747964f0adaa
-size 373536
diff --git a/ipset-6.18.tar.xz b/ipset-6.18.tar.xz
new file mode 100644
index 0000000..0b8c408
--- /dev/null
+++ b/ipset-6.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7e3586c12c9ec7903de7d8d9b71e976603e2658e7c04aedd3179eb974177d41
+size 373684
diff --git a/ipset.changes b/ipset.changes
index 637a495..c1f3db9 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 15 06:20:31 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 6.18
+* bitmap:ip,mac: fix listing with timeout
+* hash:*net*: nomatch flag not excluded on set resize
+* list:set: update reference counter when last element pushed off
+
 -------------------------------------------------------------------
 Thu Feb 21 16:07:01 UTC 2013 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index cae1fcd..e5d1b8b 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -18,7 +18,7 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.17
+Version:        6.18
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
@@ -26,7 +26,7 @@ Group:          Productivity/Networking/Security
 Url:            http://ipset.netfilter.org/
 
 #Freecode-URL:	http://freecode.com/projects/ipset/
-#DL-URL:	ftp://ftp.netfilter.org/pub/ipset/ipset-6.17.tar.bz2
+#DL-URL:	ftp://ftp.netfilter.org/pub/ipset/ipset-6.18.tar.bz2
 #Git-Clone:	git://git.netfilter.org/ipset
 #Git-Web:	http://git.netfilter.org/
 Source:         %name-%version.tar.xz