diff -Nru rabbitmq-server-3.6.10/debian/changelog rabbitmq-server-3.6.10/debian/changelog
--- rabbitmq-server-3.6.10/debian/changelog	2020-06-29 03:07:53.000000000 +0000
+++ rabbitmq-server-3.6.10/debian/changelog	2020-07-07 14:26:18.000000000 +0000
@@ -1,3 +1,14 @@
+rabbitmq-server (3.6.10-1ubuntu0.4) bionic; urgency=medium
+
+  * Improve systemd service file in order to avoid a 90-second hang
+    when restarting rabbitmq-server. (LP: #1784757) (Closes #902136)
+    - d/rabbitmq-server.service: Make sure the service starts after
+      epmd.  Use "Type=notify" for the service.
+    - d/control: Depend on socat, which is needed for the communication
+      between rabbitmq-server and systemd when "Type=notify" is used.
+
+ -- Sergio Durigan Junior <sergio.durigan@canonical.com>  Tue, 07 Jul 2020 10:26:18 -0400
+
 rabbitmq-server (3.6.10-1ubuntu0.3) bionic; urgency=medium
 
   * d/rabbitmq-server.service:
diff -Nru rabbitmq-server-3.6.10/debian/control rabbitmq-server-3.6.10/debian/control
--- rabbitmq-server-3.6.10/debian/control	2020-06-29 03:07:53.000000000 +0000
+++ rabbitmq-server-3.6.10/debian/control	2020-07-07 14:26:18.000000000 +0000
@@ -29,6 +29,7 @@
          erlang-nox (>= 1:13.b.3) | esl-erlang,
          lsb-base,
          logrotate,
+         socat,
          ${misc:Depends},
          ${python:Depends},
 Description: AMQP server written in Erlang
diff -Nru rabbitmq-server-3.6.10/debian/rabbitmq-server.service rabbitmq-server-3.6.10/debian/rabbitmq-server.service
--- rabbitmq-server-3.6.10/debian/rabbitmq-server.service	2020-06-29 03:07:53.000000000 +0000
+++ rabbitmq-server-3.6.10/debian/rabbitmq-server.service	2020-07-07 14:26:18.000000000 +0000
@@ -1,17 +1,19 @@
 [Unit]
 Description=RabbitMQ Messaging Server
-After=network.target
+After=network.target epmd@0.0.0.0.socket
+Wants=network.target epmd@0.0.0.0.socket
 
 [Service]
-Type=simple
+Type=notify
 User=rabbitmq
 SyslogIdentifier=rabbitmq
+NotifyAccess=all
+TimeoutStartSec=3600
 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
 
 [Install]