diff --git a/geoip-dir.diff b/geoip-dir.diff
deleted file mode 100644
index f65e716..0000000
--- a/geoip-dir.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Author: Jan Engelhardt <jengelh@medozas.de>
-Date:   Thu Dec 31 16:37:42 2009 +0100
-
-geoip: use /usr/share/xt_geoip instead of /var/geoip
-
-For grand FHS compliance.
-Plus OpenSUSE instructions.
----
- extensions/libxt_geoip.c   |    2 +-
- extensions/libxt_geoip.man |   11 +++++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-Index: xtables-addons-1.21/extensions/libxt_geoip.c
-===================================================================
---- xtables-addons-1.21.orig/extensions/libxt_geoip.c
-+++ xtables-addons-1.21/extensions/libxt_geoip.c
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- #include <xtables.h>
- #include "xt_geoip.h"
--#define GEOIP_DB_DIR "/var/geoip"
-+#define GEOIP_DB_DIR "/usr/share/xt_geoip"
- 
- static void geoip_help(void)
- {
-Index: xtables-addons-1.21/extensions/libxt_geoip.man
-===================================================================
---- xtables-addons-1.21.orig/extensions/libxt_geoip.man
-+++ xtables-addons-1.21/extensions/libxt_geoip.man
-@@ -8,9 +8,12 @@ Match packet going to (one of) the speci
- .TP
- NOTE:
- The country is inputed by its ISO3166 code.
--.P
--The extra files you will need is the binary database files. They are generated
-+.PP
-+The extra files you will need is the binary database files. These are provided
-+in openSUSE through the "xtables-geoip" package.
-+.PP
-+Alternatively, they can be generated
- from a country-subnet database with the geoip_csv_iv0.pl tool, available at
--http://jengelh.hopto.org/files/geoip/ . The files MUST be moved to /var/geoip/
-+http://jengelh.hopto.org/files/geoip/ . The files MUST be moved to /usr/share/geoip/
- as the shared library is statically looking for this pathname (e.g.
--/var/geoip/LE/de.iv0).
-+/usr/share/geoip/LE/de.iv0).
diff --git a/xtables-addons-1.21.tar.bz2 b/xtables-addons-1.21.tar.bz2
deleted file mode 100644
index 2cfc99c..0000000
--- a/xtables-addons-1.21.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebf2bbe07999309b4cb61ac4b58fa3312bb348669ee374c29dd91bd2ebf81285
-size 366687
diff --git a/xtables-addons-1.22.tar.bz2 b/xtables-addons-1.22.tar.bz2
new file mode 100644
index 0000000..bc9e6d8
--- /dev/null
+++ b/xtables-addons-1.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32916dee3da608b554d71e89a9cba74d2078d2be78684ccb6184b2afc8688719
+size 366217
diff --git a/xtables-addons.changes b/xtables-addons.changes
index b86a2ce..72b0791 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jan 23 02:32:52 CET 2010 - jengelh@medozas.de
+
+- new upstream release 1.22
+  * ipset: enable build of ip_set_setlist.ko
+  * quota2: add the --no-change mode
+- remove merged patch geoip-dir.diff (use
+  /usr/share/xt_geoip instead of /var/geoip)
+
 -------------------------------------------------------------------             
 Thu Dec 31 01:50:38 CET 2009 - jengelh@medozas.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index ab0f54a..1cf77fb 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xtables-addons (Version 1.21)
+# spec file for package xtables-addons (Version 1.22)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           xtables-addons
-Version:        1.21
+Version:        1.22
 Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
@@ -27,7 +27,6 @@ Url:            http://xtables-addons.sf.net/
 Source:         %name-%version.tar.bz2
 #Git-Clone:	git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons
 #Git-Web:	http://xtables-addons.git.sf.net/
-Patch1:         geoip-dir.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  %kernel_module_package_buildreqs
 BuildRequires:  iptables-devel >= 1.4.3
@@ -48,7 +47,6 @@ main kernel/iptables packages.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 if [ ! -e configure ]; then
 	./autogen.sh;
 fi;
@@ -90,4 +88,5 @@ rm -Rf "%buildroot";
 %_sbindir/*
 %_libdir/*.so.*
 %_libexecdir/xtables
+
 %changelog