diff --git a/configure.ac b/configure.ac
index 72ba18c..5cae633 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,5 +104,6 @@ AC_SUBST([kbuilddir])
 AC_SUBST([ksourcedir])
 AC_SUBST([xtlibdir])
 AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
-	extensions/Makefile extensions/ipset/Makefile])
+	extensions/Makefile extensions/ACCOUNT/Makefile
+	extensions/ipset/Makefile])
 AC_OUTPUT
diff --git a/extensions/ACCOUNT/Kbuild b/extensions/ACCOUNT/Kbuild
new file mode 100644
index 0000000..e71e80b
--- /dev/null
+++ b/extensions/ACCOUNT/Kbuild
@@ -0,0 +1,5 @@
+# -*- Makefile -*-
+
+EXTRA_CFLAGS = -I${src}/..
+
+obj-m += xt_ACCOUNT.o
diff --git a/extensions/ACCOUNT/Makefile.am b/extensions/ACCOUNT/Makefile.am
new file mode 100644
index 0000000..af3f625
--- /dev/null
+++ b/extensions/ACCOUNT/Makefile.am
@@ -0,0 +1,3 @@
+# -*- Makefile -*-
+
+include ../../Makefile.extra
diff --git a/extensions/ACCOUNT/Mbuild b/extensions/ACCOUNT/Mbuild
new file mode 100644
index 0000000..e385471
--- /dev/null
+++ b/extensions/ACCOUNT/Mbuild
@@ -0,0 +1,3 @@
+# -*- Makefile -*-
+
+obj-${build_ACCOUNT}     += libxt_ACCOUNT.so
diff --git a/extensions/libxt_ACCOUNT.c b/extensions/ACCOUNT/libxt_ACCOUNT.c
similarity index 100%
rename from extensions/libxt_ACCOUNT.c
rename to extensions/ACCOUNT/libxt_ACCOUNT.c
diff --git a/extensions/xt_ACCOUNT.c b/extensions/ACCOUNT/xt_ACCOUNT.c
similarity index 100%
rename from extensions/xt_ACCOUNT.c
rename to extensions/ACCOUNT/xt_ACCOUNT.c
diff --git a/extensions/xt_ACCOUNT.h b/extensions/ACCOUNT/xt_ACCOUNT.h
similarity index 100%
rename from extensions/xt_ACCOUNT.h
rename to extensions/ACCOUNT/xt_ACCOUNT.h
diff --git a/extensions/Kbuild b/extensions/Kbuild
index 4ff2ed9..ab3dfdd 100644
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -5,7 +5,7 @@ include ${XA_ABSTOPSRCDIR}/mconfig
 
 obj-m                    += compat_xtables.o
 
-obj-${build_ACCOUNT}     += xt_ACCOUNT.o
+obj-${build_ACCOUNT}     += ACCOUNT/
 obj-${build_CHAOS}       += xt_CHAOS.o
 obj-${build_DELUDE}      += xt_DELUDE.o
 obj-${build_DHCPMAC}     += xt_DHCPMAC.o
diff --git a/extensions/Mbuild b/extensions/Mbuild
index a1fb901..65ae18f 100644
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -1,6 +1,6 @@
 # -*- Makefile -*-
 
-obj-${build_ACCOUNT}     += libxt_ACCOUNT.so
+obj-${build_ACCOUNT}     += ACCOUNT/
 obj-${build_CHAOS}       += libxt_CHAOS.so
 obj-${build_DELUDE}      += libxt_DELUDE.so
 obj-${build_DHCPMAC}     += libxt_DHCPMAC.so libxt_dhcpmac.so