diff --git a/ipset-6.19.tar.xz b/ipset-6.19.tar.xz
deleted file mode 100644
index 978a43f..0000000
--- a/ipset-6.19.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e91ea693d76118790a33514df41148f059d8c7d1378997c61a0a416160eae485
-size 387924
diff --git a/ipset-6.20.1.tar.xz b/ipset-6.20.1.tar.xz
new file mode 100644
index 0000000..97c99e9
--- /dev/null
+++ b/ipset-6.20.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08456439ead82686f5884c90791240009f828be349c9564e5deef70734e53dcd
+size 423584
diff --git a/ipset.changes b/ipset.changes
index df6bad8..9391623 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Oct 28 12:34:04 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 6.20.1
+* build fixes for kernel 3.8 and the userspace library
+- Remove 0001-build-fix-incorrect-library-versioning.patch (merged)
+
+-------------------------------------------------------------------
+Sun Oct 20 13:03:53 UTC 2013 - jengelh@inai.de
+
+- Add 0001-build-fix-incorrect-library-versioning.patch
+
+-------------------------------------------------------------------
+Sun Oct 20 12:43:51 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 6.20
+* netns support
+* new set types: hash:net,net and hash:net,port,net
+* new extension: "comment", for annotation of set elements
+- Drop sles11.diff (no longer needed, upstream has better fix)
+
 -------------------------------------------------------------------
 Fri May 10 20:11:15 UTC 2013 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index fdcce5b..8f25c29 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -18,7 +18,7 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.19
+Version:        6.20.1
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
@@ -31,9 +31,11 @@ Url:            http://ipset.netfilter.org/
 #Git-Web:	http://git.netfilter.org/
 Source:         %name-%version.tar.xz
 Source3:        %name-preamble
-Patch1:         sles11.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
 %if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
@@ -122,7 +124,7 @@ when matching an entry against a set.
 tar --use=xz -xf "%{S:0}";
 %setup -DTq
 %endif
-%patch -P 1 -p1
+autoreconf -fi
 
 %build
 %if 0%{?with_kmp}
@@ -132,12 +134,13 @@ for flavor in %flavors_to_build; do
 	# ksource: it just checks for a header
 	%configure --disable-static \
 		--with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor" \
-		--with-ksource="/usr/src/linux";
+		--with-ksource="/usr/src/linux" \
+		--includedir="%_includedir/pkg"
 	make %{?_smp_mflags} all modules;
 	popd;
 done;
 %else
-%configure --disable-static --with-kmod=no
+%configure --disable-static --with-kmod=no --includedir="%_includedir/pkg"
 make %{?_smp_mflags};
 %endif
 
@@ -171,6 +174,7 @@ find "$b/%_libdir" -type f -name "*.la" -delete;
 %files devel
 %defattr(-,root,root)
 %_libdir/libipset.so
-%_includedir/libipset
+%_libdir/pkgconfig/libipset.pc
+%_includedir/pkg/
 
 %changelog
diff --git a/sles11.diff b/sles11.diff
deleted file mode 100644
index 16adfe3..0000000
--- a/sles11.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-
-The evil overlords backported the 5-argument form,
-causing the version check to be meaningless.
-
----
- kernel/net/netfilter/ipset/ip_set_core.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: ipset-6.13/kernel/net/netfilter/ipset/ip_set_core.c
-===================================================================
---- ipset-6.13.orig/kernel/net/netfilter/ipset/ip_set_core.c
-+++ ipset-6.13/kernel/net/netfilter/ipset/ip_set_core.c
-@@ -1180,7 +1180,7 @@ ip_set_dump(struct sock *ctnl, struct sk
- 	if (unlikely(protocol_failed(attr)))
- 		return -IPSET_ERR_PROTOCOL;
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
-+#if 0
- 	return netlink_dump_start(ctnl, skb, nlh,
- 				  ip_set_dump_start,
- 				  ip_set_dump_done);