diff --git a/doc/changelog.txt b/doc/changelog.txt
index 638232a..b473849 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,10 @@
 
 HEAD
 ====
+Changes:
+- Deactivate build of ipset-genl by default.
+  I think the original ipset package can now take over, given there are
+  a handful of kernels (2.6.39 onwards) that do not need patching.
 Enhancements:
 - Support for Linux 3.2
 
diff --git a/mconfig b/mconfig
index 997353f..f254b3d 100644
--- a/mconfig
+++ b/mconfig
@@ -20,7 +20,7 @@ build_geoip=m
 build_gradm=m
 build_iface=m
 build_ipp2p=m
-build_ipset6=m
+build_ipset6=
 build_ipv4options=m
 build_length2=m
 build_lscan=m