diff --git a/ipset-6.21.1.tar.bz2 b/ipset-6.21.1.tar.bz2
deleted file mode 100644
index d34b95b..0000000
--- a/ipset-6.21.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf46c9c35a15aa0f2e0fbab0422586757bd82386c8ad3864936e6cffbd74a331
-size 510013
diff --git a/ipset-6.23.tar.bz2 b/ipset-6.23.tar.bz2
new file mode 100644
index 0000000..d313656
--- /dev/null
+++ b/ipset-6.23.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffb8245320fc13f22233fcaf8b92a5f51298224fecc183e20785f94975310523
+size 516754
diff --git a/ipset.changes b/ipset.changes
index deb30fd..95bf038 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Tue Sep 23 18:04:06 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 6.23
+* Order create and add options in manpage so that generic ones
+  come first
+* Centralise generic create options (family, hashsize, maxelem)
+  on top of man page in the generic options section.
+* Add description of hash:mac set type to man page.
+* Add missing space for skbinfo option synopsis.
+* Support updating extensions when the set is full
+- Drop sovers.diff (no longer needed)
+
+-------------------------------------------------------------------
+Tue Sep 16 06:27:32 UTC 2014 - jengelh@inai.de
+
+- Update to new upstream release 6.22
+* includes the new set type hash:mac
+* The new skbinfo extension makes possible to store fw mark, tc
+  class and/or hardware queue parameters together with the set
+  elements and then attach them to the matchig packets by the SET
+  target.
+- Add sovers.diff to counter missing symbol errors
+
 -------------------------------------------------------------------
 Wed Mar  5 08:47:39 UTC 2014 - jengelh@inai.de
 
diff --git a/ipset.spec b/ipset.spec
index 05193a5..e72f70e 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -18,14 +18,13 @@
 
 Name:           ipset
 %define lname	libipset3
-Version:        6.21.1
+Version:        6.23
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0
 Group:          Productivity/Networking/Security
 Url:            http://ipset.netfilter.org/
 
-#Freecode-URL:	http://freecode.com/projects/ipset/
 #Git-Clone:	git://git.netfilter.org/ipset
 #Git-Web:	http://git.netfilter.org/
 Source:         ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2
@@ -102,13 +101,7 @@ addresses with MAC addresses in a way, which ensures lightning speed
 when matching an entry against a set.
 
 %prep
-%if 0%{?__xz:1}
 %setup -q
-%else
-tar --use=xz -xf "%{S:0}";
-%setup -DTq
-%endif
-autoreconf -fi
 
 %build
 %if 0%{?with_kmp}
@@ -119,12 +112,13 @@ for flavor in %flavors_to_build; do
 	%configure --disable-static \
 		--with-kbuild="/usr/src/linux-obj/%_target_cpu/$flavor" \
 		--with-ksource="/usr/src/linux" \
-		--includedir="%_includedir/pkg"
+		--includedir="%_includedir/pkg/%name"
 	make %{?_smp_mflags} all modules;
 	popd;
 done;
 %else
-%configure --disable-static --with-kmod=no --includedir="%_includedir/pkg"
+%configure --disable-static --with-kmod=no \
+	--includedir="%_includedir/pkg/%name"
 make %{?_smp_mflags};
 %endif
 
@@ -142,8 +136,7 @@ make %{?_smp_mflags} install DESTDIR="$b";
 %endif
 find "$b/%_libdir" -type f -name "*.la" -delete;
 
-%post -n %lname -p /sbin/ldconfig
-
+%post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %files