diff --git a/net-firewall/iptables/files/systemd/ip6tables.service b/net-firewall/iptables/files/systemd/ip6tables.service
deleted file mode 100644
index 0a6d7fa..0000000
--- a/net-firewall/iptables/files/systemd/ip6tables.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Store and restore ip6tables firewall rules
-
-[Install]
-Also=ip6tables-store.service
-Also=ip6tables-restore.service
diff --git a/net-firewall/iptables/files/systemd/iptables.service b/net-firewall/iptables/files/systemd/iptables.service
deleted file mode 100644
index 3643a3e..0000000
--- a/net-firewall/iptables/files/systemd/iptables.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Store and restore iptables firewall rules
-
-[Install]
-Also=iptables-store.service
-Also=iptables-restore.service
diff --git a/net-firewall/iptables/iptables-9999.ebuild b/net-firewall/iptables/iptables-9999.ebuild
index d4424e8..f1bc43a 100644
--- a/net-firewall/iptables/iptables-9999.ebuild
+++ b/net-firewall/iptables/iptables-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,19 +16,26 @@ EGIT_REPO_URI="git://git.netfilter.org/iptables.git"
 LICENSE="GPL-2"
 # Subslot tracks libxtables as that's the one other packages generally link
 # against and iptables changes.  Will have to revisit if other sonames change.
-SLOT="0/10"
+SLOT="0/12"
 KEYWORDS=""
-IUSE="conntrack ipv6 netlink pcap static-libs"
+IUSE="conntrack ipv6 netlink nftables pcap static-libs"
 
 RDEPEND="
 	conntrack? ( net-libs/libnetfilter_conntrack )
 	netlink? ( net-libs/libnfnetlink )
+	nftables? (
+		>=net-libs/libmnl-1.0
+		>=net-libs/libnftnl-1.0.5
+	)
 	pcap? ( net-libs/libpcap )
-	net-libs/libnftnl
 "
 DEPEND="${RDEPEND}
 	virtual/os-headers
 	virtual/pkgconfig
+	nftables? (
+		sys-devel/flex
+		virtual/yacc
+	)
 "
 
 src_prepare() {
@@ -55,6 +62,7 @@ src_configure() {
 		--libexecdir="${EPREFIX}/$(get_libdir)" \
 		--enable-devel \
 		--enable-shared \
+		$(use_enable nftables) \
 		$(use_enable pcap bpf-compiler) \
 		$(use_enable pcap nfsynproxy) \
 		$(use_enable static-libs static) \
@@ -90,9 +98,9 @@ src_install() {
 		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
 	fi
 
-	systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
+	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
 	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
+		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
 	fi
 
 	# Move important libs to /lib #332175