diff -Nru rabbitmq-server-3.8.2/debian/changelog rabbitmq-server-3.8.2/debian/changelog
--- rabbitmq-server-3.8.2/debian/changelog	2020-02-04 02:46:06.000000000 -0700
+++ rabbitmq-server-3.8.2/debian/changelog	2020-04-21 06:37:55.000000000 -0600
@@ -1,3 +1,16 @@
+rabbitmq-server (3.8.2-0ubuntu2) groovy; urgency=medium
+
+  * Fix timeout discrepancy between SysV and systemd (LP: #1874075)
+    upstream, rabbitmq-server-release - 694540270c8
+  * d/rabbitmq-server.init
+    - Add RABBITMQ_STARTUP_TIMEOUT and default to 600
+  * d/rabbitmq-server.service
+    - Default TimeoutStartSec to 600
+  * d/rabbitmq-server-wait
+    - Remove obsolete helper script
+
+ -- Nicolas Bock <nicolas.bock@canonical.com>  Tue, 21 Apr 2020 06:37:55 -0600
+
 rabbitmq-server (3.8.2-0ubuntu1) focal; urgency=medium
 
   * New upstream release:
diff -Nru rabbitmq-server-3.8.2/debian/rabbitmq-server-wait rabbitmq-server-3.8.2/debian/rabbitmq-server-wait
--- rabbitmq-server-3.8.2/debian/rabbitmq-server-wait	2019-09-23 02:05:48.000000000 -0600
+++ rabbitmq-server-3.8.2/debian/rabbitmq-server-wait	2020-04-21 06:37:55.000000000 -0600
@@ -19,4 +19,4 @@
 # Non-empty defaults should be set in rabbitmq-env
 . `dirname $0`/rabbitmq-env
 
-/usr/lib/rabbitmq/bin/rabbitmqctl wait $RABBITMQ_PID_FILE
+/usr/lib/rabbitmq/bin/rabbitmqctl wait --timeout $RABBITMQ_STARTUP_TIMEOUT $RABBITMQ_PID_FILE
diff -Nru rabbitmq-server-3.8.2/debian/rabbitmq-server.init rabbitmq-server-3.8.2/debian/rabbitmq-server.init
--- rabbitmq-server-3.8.2/debian/rabbitmq-server.init	2019-09-23 02:05:48.000000000 -0600
+++ rabbitmq-server-3.8.2/debian/rabbitmq-server.init	2020-04-21 06:37:55.000000000 -0600
@@ -18,6 +18,7 @@
 ROTATE_SUFFIX=
 INIT_LOG_DIR=/var/log/rabbitmq
 PID_FILE=/var/run/rabbitmq/pid
+RABBITMQ_STARTUP_TIMEOUT=600
 
 
 test -x $DAEMON || exit 0
@@ -54,7 +55,7 @@
         RABBITMQ_PID_FILE=$PID_FILE start-stop-daemon --quiet \
             --chuid rabbitmq --start --exec $DAEMON \
             --pidfile "$RABBITMQ_PID_FILE" --background
-        $CONTROL wait $PID_FILE >/dev/null 2>&1
+        $CONTROL wait --timeout $RABBITMQ_STARTUP_TIMEOUT $PID_FILE >/dev/null 2>&1
         RETVAL=$?
         set -e
         if [ $RETVAL != 0 ] ; then
diff -Nru rabbitmq-server-3.8.2/debian/rabbitmq-server.service rabbitmq-server-3.8.2/debian/rabbitmq-server.service
--- rabbitmq-server-3.8.2/debian/rabbitmq-server.service	2019-09-23 02:05:48.000000000 -0600
+++ rabbitmq-server-3.8.2/debian/rabbitmq-server.service	2020-04-21 06:37:55.000000000 -0600
@@ -9,7 +9,7 @@
 Group=rabbitmq
 UMask=0027
 NotifyAccess=all
-TimeoutStartSec=3600
+TimeoutStartSec=600
 LimitNOFILE=65536
 SyslogIdentifier=rabbitmq
 Restart=on-failure
diff -Nru rabbitmq-server-3.8.2/debian/rabbitmq-server-wait rabbitmq-server-3.8.2/debian/rabbitmq-server-wait
--- rabbitmq-server-3.8.2/debian/rabbitmq-server-wait	2019-09-23 02:05:48.000000000 -0600
+++ rabbitmq-server-3.8.2/debian/rabbitmq-server-wait	1969-12-31 17:00:00.000000000 -0700
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-##  The contents of this file are subject to the Mozilla Public License
-##  Version 1.1 (the "License"); you may not use this file except in
-##  compliance with the License. You may obtain a copy of the License
-##  at http://www.mozilla.org/MPL/
-##
-##  Software distributed under the License is distributed on an "AS IS"
-##  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-##  the License for the specific language governing rights and
-##  limitations under the License.
-##
-##  The Original Code is RabbitMQ.
-##
-##  The Initial Developer of the Original Code is GoPivotal, Inc.
-##  Copyright (c) 2007-2014 GoPivotal, Inc.  All rights reserved.
-##
-
-# Get default settings with user overrides for (RABBITMQ_)<var_name>
-# Non-empty defaults should be set in rabbitmq-env
-. `dirname $0`/rabbitmq-env
-
-/usr/lib/rabbitmq/bin/rabbitmqctl wait $RABBITMQ_PID_FILE