diff --git a/ipset-6.20.1.tar.xz b/ipset-6.20.1.tar.xz
deleted file mode 100644
index 97c99e9..0000000
--- a/ipset-6.20.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08456439ead82686f5884c90791240009f828be349c9564e5deef70734e53dcd
-size 423584
diff --git a/ipset-6.21.1.tar.bz2 b/ipset-6.21.1.tar.bz2
new file mode 100644
index 0000000..d34b95b
--- /dev/null
+++ b/ipset-6.21.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331
+size 510013
diff --git a/ipset.changes b/ipset.changes
index 9391623..deb30fd 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Mar  5 08:47:39 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 6.21.1
+* add userspace support for forceadd
+* fix ifname "physdev:" prefix parsing
+* print mark & mark mask in hex rather then decimal
+* add markmask for hash:ip,mark data type
+* add hash:ip,mark data type to ipset
+* Fix all set output from list/save when set with counters in use.
+* ipset: Fix malformed output from list/save for ICMP types in port 
+  field
+* ipset: fix timeout data type size (Nikolay Martynov)
+
 -------------------------------------------------------------------
 Mon Oct 28 12:34:04 UTC 2013 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index 8f25c29..05193a5 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ipset
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -18,7 +18,7 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.20.1
+Version:        6.21.1
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
@@ -26,33 +26,18 @@ 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.19.tar.bz2
 #Git-Clone:	git://git.netfilter.org/ipset
 #Git-Web:	http://git.netfilter.org/
-Source:         %name-%version.tar.xz
+Source:         ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2
 Source3:        %name-preamble
 
 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}
-BuildRequires:  pkgconfig(libmnl) >= 1
-%else
-BuildRequires:  libmnl-devel >= 1
-%endif
-%if 0%{?suse_version} >= 1140
 BuildRequires:  linux-glibc-devel >= 2.6.24
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-BuildRequires:  linux-kernel-headers >= 2.6.24
-%endif
-%if 0%{?redhat_version} || 0%{?centos_version} || 0%{?fedora_version}
-BuildRequires:  kernel-headers >= 2.6.24
-%endif
-%if 0%{?suse_version}
+BuildRequires:  pkgconfig >= 0.21
+BuildRequires:  pkgconfig(libmnl) >= 1
 # Make quilt happy
 %if 0%{?kernel_module_package_buildreqs:1}
 %define with_kmp 1
@@ -60,7 +45,6 @@ BuildRequires:  %kernel_module_package_buildreqs
 %endif
 BuildRequires:  kernel-syms >= 2.6.39
 Recommends:     %name-kmp
-%endif
 
 %if 0%{?with_kmp:1}
 %kernel_module_package -p %name-preamble