diff -Nru rabbitmq-server-3.5.7/debian/changelog rabbitmq-server-3.5.7/debian/changelog
--- rabbitmq-server-3.5.7/debian/changelog	2020-04-22 22:02:31.000000000 +0000
+++ rabbitmq-server-3.5.7/debian/changelog	2020-06-29 03:43:21.000000000 +0000
@@ -1,3 +1,10 @@
+rabbitmq-server (3.5.7-1ubuntu0.16.04.4) xenial; urgency=medium
+
+  * d/rabbitmq-server.service:
+    - add TimeoutStartSec, Restart, RestartSec parameters (LP: #1874075)
+
+ -- Matthew Ruffell <matthew.ruffell@canonical.com>  Mon, 29 Jun 2020 15:43:21 +1200
+
 rabbitmq-server (3.5.7-1ubuntu0.16.04.3) xenial; urgency=medium
 
   * Fix timeout discrepancy between SysV and systemd (LP: #1874075)
diff -Nru rabbitmq-server-3.5.7/debian/rabbitmq-server.service rabbitmq-server-3.5.7/debian/rabbitmq-server.service
--- rabbitmq-server-3.5.7/debian/rabbitmq-server.service	2020-04-22 22:02:31.000000000 +0000
+++ rabbitmq-server-3.5.7/debian/rabbitmq-server.service	2020-06-29 03:43:21.000000000 +0000
@@ -7,6 +7,9 @@
 User=rabbitmq
 SyslogIdentifier=rabbitmq
 LimitNOFILE=65536
+TimeoutStartSec=600
+Restart=on-failure
+RestartSec=10
 ExecStart=/usr/sbin/rabbitmq-server
 ExecStartPost=/usr/lib/rabbitmq/bin/rabbitmq-server-wait
 ExecStop=/usr/sbin/rabbitmqctl stop