diff --git a/iptables.service b/iptables.service
index 342ac93..6b996d1 100644
--- a/iptables.service
+++ b/iptables.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=IPv4 firewall with iptables
-After=syslog.target
 AssertPathExists=/etc/sysconfig/iptables
+Before=network-pre.target
+Wants=network-pre.target
 
 [Service]
 Type=oneshot
@@ -13,4 +14,4 @@ Environment=BOOTUP=serial
 Environment=CONSOLETYPE=serial
 
 [Install]
-WantedBy=basic.target
+WantedBy=multi-user.target
diff --git a/iptables.spec b/iptables.spec
index 065925d..7723332 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -14,7 +14,7 @@ Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 URL: https://www.netfilter.org/projects/iptables
 Version: 1.8.7
-Release: 15%{?dist}
+Release: 16%{?dist}
 Source: %{url}/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -448,6 +448,9 @@ fi
 
 
 %changelog
+* Mon Jul 05 2021 Phil Sutter <psutter@redhat.com> - 1.8.7-16
+- Review systemd unit file
+
 * Fri Jul 02 2021 Phil Sutter <psutter@redhat.com> - 1.8.7-15
 - doc: Improve deprecation notices a bit
 - nft: cache: Sort chains on demand only