diff --git a/configure.ac b/configure.ac
index eb682c3..c013743 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,5 +86,5 @@ AC_SUBST([kbuilddir])
 AC_SUBST([xtlibdir])
 AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile
 	extensions/Makefile extensions/ACCOUNT/Makefile
-	extensions/ipset/Makefile extensions/pknock/Makefile])
+	extensions/ipset-4/Makefile extensions/pknock/Makefile])
 AC_OUTPUT
diff --git a/extensions/Kbuild b/extensions/Kbuild
index e4e2490..6edf268 100644
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -26,7 +26,7 @@ obj-${build_fuzzy}       += xt_fuzzy.o
 obj-${build_geoip}       += xt_geoip.o
 obj-${build_iface}       += xt_iface.o
 obj-${build_ipp2p}       += xt_ipp2p.o
-obj-${build_ipset}       += ipset/
+obj-${build_ipset4}      += ipset-4/
 obj-${build_ipv4options} += xt_ipv4options.o
 obj-${build_length2}     += xt_length2.o
 obj-${build_lscan}       += xt_lscan.o
diff --git a/extensions/Mbuild b/extensions/Mbuild
index 3e5557c..a0ed20b 100644
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -18,7 +18,7 @@ obj-${build_fuzzy}       += libxt_fuzzy.so
 obj-${build_geoip}       += libxt_geoip.so
 obj-${build_iface}       += libxt_iface.so
 obj-${build_ipp2p}       += libxt_ipp2p.so
-obj-${build_ipset}       += ipset/
+obj-${build_ipset4}      += ipset-4/
 obj-${build_ipv4options} += libxt_ipv4options.so
 obj-${build_length2}     += libxt_length2.so
 obj-${build_lscan}       += libxt_lscan.so
diff --git a/extensions/ipset/.gitignore b/extensions/ipset-4/.gitignore
similarity index 100%
rename from extensions/ipset/.gitignore
rename to extensions/ipset-4/.gitignore
diff --git a/extensions/ipset/Kbuild b/extensions/ipset-4/Kbuild
similarity index 100%
rename from extensions/ipset/Kbuild
rename to extensions/ipset-4/Kbuild
diff --git a/extensions/ipset/Makefile.am b/extensions/ipset-4/Makefile.am
similarity index 100%
rename from extensions/ipset/Makefile.am
rename to extensions/ipset-4/Makefile.am
diff --git a/extensions/ipset/Mbuild b/extensions/ipset-4/Mbuild
similarity index 100%
rename from extensions/ipset/Mbuild
rename to extensions/ipset-4/Mbuild
diff --git a/extensions/ipset/ip_set.c b/extensions/ipset-4/ip_set.c
similarity index 100%
rename from extensions/ipset/ip_set.c
rename to extensions/ipset-4/ip_set.c
diff --git a/extensions/ipset/ip_set.h b/extensions/ipset-4/ip_set.h
similarity index 100%
rename from extensions/ipset/ip_set.h
rename to extensions/ipset-4/ip_set.h
diff --git a/extensions/ipset/ip_set_bitmaps.h b/extensions/ipset-4/ip_set_bitmaps.h
similarity index 100%
rename from extensions/ipset/ip_set_bitmaps.h
rename to extensions/ipset-4/ip_set_bitmaps.h
diff --git a/extensions/ipset/ip_set_compat.h b/extensions/ipset-4/ip_set_compat.h
similarity index 100%
rename from extensions/ipset/ip_set_compat.h
rename to extensions/ipset-4/ip_set_compat.h
diff --git a/extensions/ipset/ip_set_getport.h b/extensions/ipset-4/ip_set_getport.h
similarity index 100%
rename from extensions/ipset/ip_set_getport.h
rename to extensions/ipset-4/ip_set_getport.h
diff --git a/extensions/ipset/ip_set_hashes.h b/extensions/ipset-4/ip_set_hashes.h
similarity index 100%
rename from extensions/ipset/ip_set_hashes.h
rename to extensions/ipset-4/ip_set_hashes.h
diff --git a/extensions/ipset/ip_set_iphash.c b/extensions/ipset-4/ip_set_iphash.c
similarity index 100%
rename from extensions/ipset/ip_set_iphash.c
rename to extensions/ipset-4/ip_set_iphash.c
diff --git a/extensions/ipset/ip_set_iphash.h b/extensions/ipset-4/ip_set_iphash.h
similarity index 100%
rename from extensions/ipset/ip_set_iphash.h
rename to extensions/ipset-4/ip_set_iphash.h
diff --git a/extensions/ipset/ip_set_ipmap.c b/extensions/ipset-4/ip_set_ipmap.c
similarity index 100%
rename from extensions/ipset/ip_set_ipmap.c
rename to extensions/ipset-4/ip_set_ipmap.c
diff --git a/extensions/ipset/ip_set_ipmap.h b/extensions/ipset-4/ip_set_ipmap.h
similarity index 100%
rename from extensions/ipset/ip_set_ipmap.h
rename to extensions/ipset-4/ip_set_ipmap.h
diff --git a/extensions/ipset/ip_set_ipporthash.c b/extensions/ipset-4/ip_set_ipporthash.c
similarity index 100%
rename from extensions/ipset/ip_set_ipporthash.c
rename to extensions/ipset-4/ip_set_ipporthash.c
diff --git a/extensions/ipset/ip_set_ipporthash.h b/extensions/ipset-4/ip_set_ipporthash.h
similarity index 100%
rename from extensions/ipset/ip_set_ipporthash.h
rename to extensions/ipset-4/ip_set_ipporthash.h
diff --git a/extensions/ipset/ip_set_ipportiphash.c b/extensions/ipset-4/ip_set_ipportiphash.c
similarity index 100%
rename from extensions/ipset/ip_set_ipportiphash.c
rename to extensions/ipset-4/ip_set_ipportiphash.c
diff --git a/extensions/ipset/ip_set_ipportiphash.h b/extensions/ipset-4/ip_set_ipportiphash.h
similarity index 100%
rename from extensions/ipset/ip_set_ipportiphash.h
rename to extensions/ipset-4/ip_set_ipportiphash.h
diff --git a/extensions/ipset/ip_set_ipportnethash.c b/extensions/ipset-4/ip_set_ipportnethash.c
similarity index 100%
rename from extensions/ipset/ip_set_ipportnethash.c
rename to extensions/ipset-4/ip_set_ipportnethash.c
diff --git a/extensions/ipset/ip_set_ipportnethash.h b/extensions/ipset-4/ip_set_ipportnethash.h
similarity index 100%
rename from extensions/ipset/ip_set_ipportnethash.h
rename to extensions/ipset-4/ip_set_ipportnethash.h
diff --git a/extensions/ipset/ip_set_iptree.c b/extensions/ipset-4/ip_set_iptree.c
similarity index 100%
rename from extensions/ipset/ip_set_iptree.c
rename to extensions/ipset-4/ip_set_iptree.c
diff --git a/extensions/ipset/ip_set_iptree.h b/extensions/ipset-4/ip_set_iptree.h
similarity index 100%
rename from extensions/ipset/ip_set_iptree.h
rename to extensions/ipset-4/ip_set_iptree.h
diff --git a/extensions/ipset/ip_set_iptreemap.c b/extensions/ipset-4/ip_set_iptreemap.c
similarity index 100%
rename from extensions/ipset/ip_set_iptreemap.c
rename to extensions/ipset-4/ip_set_iptreemap.c
diff --git a/extensions/ipset/ip_set_iptreemap.h b/extensions/ipset-4/ip_set_iptreemap.h
similarity index 100%
rename from extensions/ipset/ip_set_iptreemap.h
rename to extensions/ipset-4/ip_set_iptreemap.h
diff --git a/extensions/ipset/ip_set_jhash.h b/extensions/ipset-4/ip_set_jhash.h
similarity index 100%
rename from extensions/ipset/ip_set_jhash.h
rename to extensions/ipset-4/ip_set_jhash.h
diff --git a/extensions/ipset/ip_set_macipmap.c b/extensions/ipset-4/ip_set_macipmap.c
similarity index 100%
rename from extensions/ipset/ip_set_macipmap.c
rename to extensions/ipset-4/ip_set_macipmap.c
diff --git a/extensions/ipset/ip_set_macipmap.h b/extensions/ipset-4/ip_set_macipmap.h
similarity index 100%
rename from extensions/ipset/ip_set_macipmap.h
rename to extensions/ipset-4/ip_set_macipmap.h
diff --git a/extensions/ipset/ip_set_malloc.h b/extensions/ipset-4/ip_set_malloc.h
similarity index 100%
rename from extensions/ipset/ip_set_malloc.h
rename to extensions/ipset-4/ip_set_malloc.h
diff --git a/extensions/ipset/ip_set_nethash.c b/extensions/ipset-4/ip_set_nethash.c
similarity index 100%
rename from extensions/ipset/ip_set_nethash.c
rename to extensions/ipset-4/ip_set_nethash.c
diff --git a/extensions/ipset/ip_set_nethash.h b/extensions/ipset-4/ip_set_nethash.h
similarity index 100%
rename from extensions/ipset/ip_set_nethash.h
rename to extensions/ipset-4/ip_set_nethash.h
diff --git a/extensions/ipset/ip_set_portmap.c b/extensions/ipset-4/ip_set_portmap.c
similarity index 100%
rename from extensions/ipset/ip_set_portmap.c
rename to extensions/ipset-4/ip_set_portmap.c
diff --git a/extensions/ipset/ip_set_portmap.h b/extensions/ipset-4/ip_set_portmap.h
similarity index 100%
rename from extensions/ipset/ip_set_portmap.h
rename to extensions/ipset-4/ip_set_portmap.h
diff --git a/extensions/ipset/ip_set_setlist.c b/extensions/ipset-4/ip_set_setlist.c
similarity index 100%
rename from extensions/ipset/ip_set_setlist.c
rename to extensions/ipset-4/ip_set_setlist.c
diff --git a/extensions/ipset/ip_set_setlist.h b/extensions/ipset-4/ip_set_setlist.h
similarity index 100%
rename from extensions/ipset/ip_set_setlist.h
rename to extensions/ipset-4/ip_set_setlist.h
diff --git a/extensions/ipset/ipset.8 b/extensions/ipset-4/ipset.8
similarity index 100%
rename from extensions/ipset/ipset.8
rename to extensions/ipset-4/ipset.8
diff --git a/extensions/ipset/ipset.c b/extensions/ipset-4/ipset.c
similarity index 100%
rename from extensions/ipset/ipset.c
rename to extensions/ipset-4/ipset.c
diff --git a/extensions/ipset/ipset.h b/extensions/ipset-4/ipset.h
similarity index 100%
rename from extensions/ipset/ipset.h
rename to extensions/ipset-4/ipset.h
diff --git a/extensions/ipset/ipset_iphash.c b/extensions/ipset-4/ipset_iphash.c
similarity index 100%
rename from extensions/ipset/ipset_iphash.c
rename to extensions/ipset-4/ipset_iphash.c
diff --git a/extensions/ipset/ipset_ipmap.c b/extensions/ipset-4/ipset_ipmap.c
similarity index 100%
rename from extensions/ipset/ipset_ipmap.c
rename to extensions/ipset-4/ipset_ipmap.c
diff --git a/extensions/ipset/ipset_ipporthash.c b/extensions/ipset-4/ipset_ipporthash.c
similarity index 100%
rename from extensions/ipset/ipset_ipporthash.c
rename to extensions/ipset-4/ipset_ipporthash.c
diff --git a/extensions/ipset/ipset_ipportiphash.c b/extensions/ipset-4/ipset_ipportiphash.c
similarity index 100%
rename from extensions/ipset/ipset_ipportiphash.c
rename to extensions/ipset-4/ipset_ipportiphash.c
diff --git a/extensions/ipset/ipset_ipportnethash.c b/extensions/ipset-4/ipset_ipportnethash.c
similarity index 100%
rename from extensions/ipset/ipset_ipportnethash.c
rename to extensions/ipset-4/ipset_ipportnethash.c
diff --git a/extensions/ipset/ipset_iptree.c b/extensions/ipset-4/ipset_iptree.c
similarity index 100%
rename from extensions/ipset/ipset_iptree.c
rename to extensions/ipset-4/ipset_iptree.c
diff --git a/extensions/ipset/ipset_iptreemap.c b/extensions/ipset-4/ipset_iptreemap.c
similarity index 100%
rename from extensions/ipset/ipset_iptreemap.c
rename to extensions/ipset-4/ipset_iptreemap.c
diff --git a/extensions/ipset/ipset_macipmap.c b/extensions/ipset-4/ipset_macipmap.c
similarity index 100%
rename from extensions/ipset/ipset_macipmap.c
rename to extensions/ipset-4/ipset_macipmap.c
diff --git a/extensions/ipset/ipset_nethash.c b/extensions/ipset-4/ipset_nethash.c
similarity index 100%
rename from extensions/ipset/ipset_nethash.c
rename to extensions/ipset-4/ipset_nethash.c
diff --git a/extensions/ipset/ipset_portmap.c b/extensions/ipset-4/ipset_portmap.c
similarity index 100%
rename from extensions/ipset/ipset_portmap.c
rename to extensions/ipset-4/ipset_portmap.c
diff --git a/extensions/ipset/ipset_setlist.c b/extensions/ipset-4/ipset_setlist.c
similarity index 100%
rename from extensions/ipset/ipset_setlist.c
rename to extensions/ipset-4/ipset_setlist.c
diff --git a/extensions/ipset/ipt_SET.c b/extensions/ipset-4/ipt_SET.c
similarity index 100%
rename from extensions/ipset/ipt_SET.c
rename to extensions/ipset-4/ipt_SET.c
diff --git a/extensions/ipset/ipt_set.c b/extensions/ipset-4/ipt_set.c
similarity index 100%
rename from extensions/ipset/ipt_set.c
rename to extensions/ipset-4/ipt_set.c
diff --git a/extensions/ipset/ipt_set.h b/extensions/ipset-4/ipt_set.h
similarity index 100%
rename from extensions/ipset/ipt_set.h
rename to extensions/ipset-4/ipt_set.h
diff --git a/mconfig b/mconfig
index 717603b..c99629c 100644
--- a/mconfig
+++ b/mconfig
@@ -19,7 +19,7 @@ build_geoip=m
 build_gradm=m
 build_iface=m
 build_ipp2p=m
-build_ipset=m
+build_ipset4=m
 build_ipv4options=m
 build_length2=m
 build_lscan=m