diff --git a/rwho.spec b/rwho.spec
index abff7cb..93a002a 100644
--- a/rwho.spec
+++ b/rwho.spec
@@ -1,7 +1,7 @@
 Summary: Displays who is logged in to local network machines
 Name: rwho
 Version: 0.17
-Release: 57%{?dist}
+Release: 58%{?dist}
 # part of rwhod is under GPL+, other parts are under BSD
 License: BSD and GPL+
 Group: System Environment/Daemons
@@ -98,6 +98,9 @@ install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}/rwhod.service
 %{_unitdir}/*
 
 %changelog
+* Fri Jul 21 2017 Petr Kubat <pkubat@redhat.com> - 0.17-58
+- Start rwhod after the network is properly configured (#1473089)
+
 * Mon Feb 13 2017 Petr Kubat <pkubat@redhat.com> - 0.17-57
 - Add BuildRequires for perl
 
diff --git a/rwhod.service b/rwhod.service
index be28b3e..83f2ced 100644
--- a/rwhod.service
+++ b/rwhod.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Remote Machine Logged In User Lister
 Requires=network.target
-After=syslog.target network.target
+Wants=network-online.target
+After=syslog.target network-online.target
 
 [Service]
 Type=forking