diff --git a/include/netfilter.mk b/include/netfilter.mk
index 86f35e5fd4..1d89e6d539 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -76,8 +76,7 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_TA
 
 # extra
 
-# kernel only
-
+$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE, $(if $(NF_KMOD),$(P_XT)xt_addrtype,$(P_XT)ipt_addrtype)))
 $(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_OWNER, $(P_XT)xt_owner))
 $(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_physdev))
 $(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PKTTYPE, $(P_XT)xt_pkttype))
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index b739a9c28a..69bdba0fcb 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -377,6 +377,7 @@ endef
 define KernelPackage/ipt-extra/description
  Other Netfilter (IPv4) kernel modules
  Includes:
+ - addrtype
  - owner
  - physdev (if bridge support was enabled in kernel)
  - pkttype
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index a3d8864c3f..b9045b1753 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -234,6 +234,7 @@ define Package/iptables-mod-extra/description
 Other extra iptables extensions.
 
  Matches:
+  - addrtype
   - condition
   - owner
   - physdev (if ebtables is enabled)