diff --git a/iptables-1.8.0-xtables-nft-multi.patch b/iptables-1.8.0-xtables-nft-multi.patch
new file mode 100644
index 0000000..f1f5ab8
--- /dev/null
+++ b/iptables-1.8.0-xtables-nft-multi.patch
@@ -0,0 +1,15 @@
+diff --git a/iptables/xtables-nft-multi.c b/iptables/xtables-nft-multi.c
+index 187da81e9f59b..03690a56edb72 100644
+--- 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},
+ };
diff --git a/iptables.spec b/iptables.spec
index 812764e..0ee7aa3 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -7,7 +7,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -15,6 +15,7 @@ Source3: iptables.service
 Source4: sysconfig_iptables
 Source5: sysconfig_ip6tables
 Patch1: iptables-1.6.0-iptables-apply_mktemp.patch
+Patch2: iptables-1.8.0-xtables-nft-multi.patch
 URL: http://www.netfilter.org/
 # pf.os: ISC license
 # iptables-apply: Artistic Licence 2.0
@@ -115,6 +116,7 @@ nftables compatibility for iptables, arptables and ebtables.
 %prep
 %setup -q
 %patch1 -p1 -b .iptables-apply_mktemp
+%patch2 -p1 -b .iptables-xtables_nft_multi
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \
@@ -350,6 +352,9 @@ fi
 %ghost %{_sbindir}/arptables
 
 %changelog
+* Tue Jul 10 2018 Phil Sutter <psutter@redhat.com> - 1.8.0-2
+- Fix calling ebtables-nft and arptables-nft via their new names.
+
 * Mon Jul 09 2018 Phil Sutter <psutter@redhat.com> - 1.8.0-1
 - New upstream version 1.8.0.
 - Replace ldconfig calls with newly introduced macros.