Backport of

https://git.netfilter.org/iptables/commit/?id=565a22395c4c620bf26a002515d9016db0c35824

Bug: https://bugs.gentoo.org/660886
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -80,7 +80,9 @@ x_sbin_links  = iptables-nft iptables-nft-restore iptables-nft-save \
 		ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \
 		iptables-translate ip6tables-translate \
 		iptables-restore-translate ip6tables-restore-translate \
-		arptables ebtables xtables-monitor
+		arptables-nft arptables \
+		ebtables-nft ebtables \
+		xtables-monitor
 endif
 
 iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
--- a/iptables/Makefile.in
+++ b/iptables/Makefile.in
@@ -526,7 +526,9 @@ vx_bin_links = iptables-xml
 @ENABLE_NFTABLES_TRUE@		ip6tables-nft ip6tables-nft-restore ip6tables-nft-save \
 @ENABLE_NFTABLES_TRUE@		iptables-translate ip6tables-translate \
 @ENABLE_NFTABLES_TRUE@		iptables-restore-translate ip6tables-restore-translate \
-@ENABLE_NFTABLES_TRUE@		arptables ebtables xtables-monitor
+@ENABLE_NFTABLES_TRUE@		arptables-nft arptables \
+@ENABLE_NFTABLES_TRUE@		ebtables-nft ebtables \
+@ENABLE_NFTABLES_TRUE@		xtables-monitor
 
 pkgconfig_DATA = xtables.pc
 all: $(BUILT_SOURCES)
--- a/iptables/xtables-nft-multi.c
+++ b/iptables/xtables-nft-multi.c
@@ -31,8 +31,10 @@ static const struct subcommand multi_subcommands[] = {
 	{"iptables-restore-translate",	xtables_ip4_xlate_restore_main},
 	{"ip6tables-restore-translate",	xtables_ip6_xlate_restore_main},
 	{"arptables",			xtables_arp_main},
+	{"arptables-nft",		xtables_arp_main},
 	{"ebtables-translate",		xtables_eb_xlate_main},
 	{"ebtables",			xtables_eb_main},
+	{"ebtables-nft",		xtables_eb_main},
 	{"xtables-monitor",		xtables_monitor_main},
 	{NULL},
 };