diff --git a/debian/changelog b/debian/changelog
index be7ef9c0..658a78a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mosquitto (1.5.8-1) unstable; urgency=medium
 
   * New upstream release.
   * Remove bug-1162.patch, fixed upstream.
+  * Add --retry to init file as per
+    https://github.com/eclipse/mosquitto/issues/1117
 
  -- Roger A. Light <roger@atchoo.org>  Wed, 06 Mar 2019 10:21:43 +0000
 
diff --git a/debian/mosquitto.init b/debian/mosquitto.init
index 5613d19f..f82276f2 100755
--- a/debian/mosquitto.init
+++ b/debian/mosquitto.init
@@ -55,7 +55,7 @@ case "$1" in
 	    exit 0
 	fi
 	log_daemon_msg "Stopping network daemon:" "mosquitto"
-	if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE}; then
+	if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} --retry 30; then
 	    log_end_msg 0
 	    rm -f ${PIDFILE}
 	else