diff --git a/munin-asyncd.service b/munin-asyncd.service
index 18f7397..6a73b77 100644
--- a/munin-asyncd.service
+++ b/munin-asyncd.service
@@ -2,7 +2,8 @@
 Description=Munin Async Server.
 Documentation=man:munin-node
 Requires=munin-node.service
-After=network.target munin-node.service
+After=network-online.target munin-node.service
+Wants=network-online.target
 
 [Service]
 Type=simple
diff --git a/munin-node.service-privatetmp b/munin-node.service-privatetmp
index 5309bd8..87c1347 100644
--- a/munin-node.service-privatetmp
+++ b/munin-node.service-privatetmp
@@ -1,7 +1,8 @@
 [Unit]
 Description=Munin Node Server.
 Documentation=man:munin-node
-After=network.target
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=forking
diff --git a/munin.spec b/munin.spec
index 890fcf0..41ed19a 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:           munin
 Version:        2.0.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -871,6 +871,9 @@ exit 0
 
 
 %changelog
+* Wed Jan 25 2017 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.30-2
+- RHBZ#: 1416199 - Munin-node is unable to determine FQDN hostname at boot
+
 * Thu Jan 19 2017 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.30-1
 - Upstream released 2.0.30