diff --git a/mosquitto.spec b/mosquitto.spec
index be6c8fa..5047c09 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -1,6 +1,6 @@
 Name:           mosquitto
 Version:        1.4.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An Open Source MQTT v3.1/v3.1.1 Broker
 
 License:        BSD
@@ -59,6 +59,8 @@ cat > mosquitto.service << FOE
 [Unit]
 Description=Mosquitto MQTT v3.1/v3.1.1 Broker
 Documentation=man:mosquitto.conf(5) man:mosquitto(8)
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf
@@ -114,6 +116,9 @@ exit 0
 %{_mandir}/man3/*.3.*
 
 %changelog
+* Sat May 05 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.4.15-2
+- Update systemd unit file (rhbz#1564733)
+
 * Tue Mar 06 2018 Fabian Affolter <mail@fabian-affolter.ch> - 1.4.15-1
 - Fix CVE-2017-7651 (rhbz#1551755, rhbz#1551754)
 - Fix CVE-2017-7652 (rhbz#1551743, rhbz#1551745)