diff --git a/bind.spec b/bind.spec
index 1aad894..fd90818 100644
--- a/bind.spec
+++ b/bind.spec
@@ -999,6 +999,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %changelog
 * Thu May 12 2016 Tomas Hozza <thozza@redhat.com> - 32:9.10.3-13.P4
 - Remove NM dispatcher script, since it is not needed any more (#1277257)
+- Replaced After=network-online.target with After=network.target in all unit files
 
 * Fri Mar 11 2016 Tomas Hozza <thozza@redhat.com> - 32:9.10.3-12.P4
 - Update to 9.10.3-P4 due to CVE-2016-1285 CVE-2016-1286 CVE-2016-2088
diff --git a/named-chroot.service b/named-chroot.service
index 87d6b7b..a015168 100644
--- a/named-chroot.service
+++ b/named-chroot.service
@@ -5,11 +5,10 @@
 [Unit]
 Description=Berkeley Internet Name Domain (DNS)
 Wants=nss-lookup.target
-Wants=network-online.target
 Requires=named-chroot-setup.service
 Before=nss-lookup.target
 After=named-chroot-setup.service
-After=network-online.target
+After=network.target
 
 [Service]
 Type=forking
diff --git a/named-pkcs11.service b/named-pkcs11.service
index 6ce9001..e522ec3 100644
--- a/named-pkcs11.service
+++ b/named-pkcs11.service
@@ -1,10 +1,9 @@
 [Unit]
 Description=Berkeley Internet Name Domain (DNS) with native PKCS#11
 Wants=nss-lookup.target
-Wants=network-online.target
 Wants=named-setup-rndc.service
 Before=nss-lookup.target
-After=network-online.target
+After=network.target
 After=named-setup-rndc.service
 
 [Service]
diff --git a/named-sdb-chroot.service b/named-sdb-chroot.service
index 347b43c..0cc0c31 100644
--- a/named-sdb-chroot.service
+++ b/named-sdb-chroot.service
@@ -5,11 +5,10 @@
 [Unit]
 Description=Berkeley Internet Name Domain (DNS)
 Wants=nss-lookup.target
-Wants=network-online.target
 Requires=named-sdb-chroot-setup.service
 Before=nss-lookup.target
 After=named-sdb-chroot-setup.service
-After=network-online.target
+After=network.target
 
 [Service]
 Type=forking
diff --git a/named-sdb.service b/named-sdb.service
index b3f57d1..530156d 100644
--- a/named-sdb.service
+++ b/named-sdb.service
@@ -2,10 +2,9 @@
 Description=Berkeley Internet Name Domain (DNS)
 Wants=nss-lookup.target
 Wants=named-setup-rndc.service
-Wants=network-online.target
 Before=nss-lookup.target
 After=named-setup-rndc.service
-After=network-online.target
+After=network.target
 
 [Service]
 Type=forking
diff --git a/named.service b/named.service
index 09bf377..bbacf75 100644
--- a/named.service
+++ b/named.service
@@ -2,10 +2,9 @@
 Description=Berkeley Internet Name Domain (DNS)
 Wants=nss-lookup.target
 Wants=named-setup-rndc.service
-Wants=network-online.target
 Before=nss-lookup.target
 After=named-setup-rndc.service
-After=network-online.target
+After=network.target
 
 [Service]
 Type=forking