diff --git a/xtables-addons-preamble b/xtables-addons-preamble
index ace95d0..2a6d635 100644
--- a/xtables-addons-preamble
+++ b/xtables-addons-preamble
@@ -1 +1,3 @@
 Requires: kernel-%1
+Enhances: kernel-%1
+Supplements: packageand(kernel-%1:xtables-addons)
diff --git a/xtables-addons.changes b/xtables-addons.changes
index e5438af..eb3a74e 100644
--- a/xtables-addons.changes
+++ b/xtables-addons.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec 30 23:35:33 UTC 2011 - jengelh@medozas.de
+
+- We have now a few of kernel versions that ipset can be compiled
+  against, so ipset has been separated out into a new RPM package,
+  and ipset-genl from xtables-addons is hereby subsequently
+  disabled.
+
 -------------------------------------------------------------------
 Wed Nov 30 10:43:07 UTC 2011 - jengelh@medozas.de
 
diff --git a/xtables-addons.spec b/xtables-addons.spec
index d1b409d..26a4f02 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -23,19 +23,15 @@ Release:        1
 Group:          Productivity/Networking/Security
 Summary:        IP Packet Filter Administration Extensions
 License:        GPL-2.0; GPL-2.0+
-URL:            http://xtables-addons.sf.net/
+Url:            http://xtables-addons.sf.net/
 Source:         %name-%version.tar.xz
 Source2:        %name-%version.tar.xz.asc
 Source3:        %name-preamble
 #Git-Clone:	git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons
 #Git-Web:	http://xtables-addons.git.sf.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  iptables-devel >= 1.4.5 libmnl-devel >= 1
-BuildRequires:  pkgconfig >= 0.23 xz
-# Yes, we've got a lot of good stuff!
-%if 0%{?suse_version} >= 1140
-Provides:       ipset = 6.10
-%endif
+BuildRequires:  autoconf automake libtool
+BuildRequires:  pkgconfig >= 0.23 pkgconfig(xtables) >= 1.4.5 xz
 %if 0%{?suse_version}
 BuildRequires:  %kernel_module_package_buildreqs
 Recommends:     %name-kmp
@@ -75,10 +71,8 @@ main kernel/iptables packages.
 if [ ! -e configure ]; then
 	./autogen.sh;
 fi;
-%if 0%{?suse_version} < 1140
-# ipset6-genl needs >=2.6.35, which is usually not present before 11.4
+# ipset now in a separate RPM
 echo "build_ipset6=" >>mconfig;
-%endif
 pushd ../;
 for flavor in %flavors_to_build; do
 	cp -a "%name-%version" "%name-$flavor-%version";