diff --git a/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch b/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch
new file mode 100644
index 0000000..15576a1
--- /dev/null
+++ b/rabbitmq-common-0003-Disable-erl_crash.dump-generation-for-EPMD-checker.patch
@@ -0,0 +1,20 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Tue, 23 Jul 2019 15:30:08 +0200
+Subject: [PATCH] Disable erl_crash.dump generation for EPMD checker
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl
+index e1932cc..bbad52e 100644
+--- a/src/rabbit_nodes_common.erl
++++ b/src/rabbit_nodes_common.erl
+@@ -89,7 +89,8 @@ do_ensure_epmd(Exe, _) ->
+              [{args, ["-sname", rabbit_misc:format("epmd-starter-~b", [ID]),
+                       "-proto_dist", rabbit_misc:format("~p", [ProtoDist]),
+                       "-noshell", "-eval", "halt()."]},
+-              exit_status, stderr_to_stdout, use_stdio]),
++              exit_status, stderr_to_stdout, use_stdio,
++	      {env, [{"ERL_CRASH_DUMP_SECONDS", "0"}]}]),
+     port_shutdown_loop(Port).
+ 
+ port_shutdown_loop(Port) ->
diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch
index 5f0b150..b7a4dc3 100644
--- a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch
+++ b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove excessive sd_notify code
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/src/rabbit.erl b/src/rabbit.erl
-index d30542a6f..c0bbdbaa2 100644
+index b39a81550..20f98cd0e 100644
 --- a/src/rabbit.erl
 +++ b/src/rabbit.erl
 @@ -352,123 +352,9 @@ broker_start() ->
diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch
index 8735ae5..4e3c68d 100644
--- a/rabbitmq-server-0002-Add-systemd-notification-support.patch
+++ b/rabbitmq-server-0002-Add-systemd-notification-support.patch
@@ -4,7 +4,7 @@ Subject: [PATCH] Add systemd notification support
 
 
 diff --git a/src/rabbit.erl b/src/rabbit.erl
-index c0bbdbaa2..956b4bf74 100644
+index 20f98cd0e..fd1023f24 100644
 --- a/src/rabbit.erl
 +++ b/src/rabbit.erl
 @@ -352,6 +352,11 @@ broker_start() ->
diff --git a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch
index 19a9add..03cd57a 100644
--- a/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch
+++ b/rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] rabbit_prelaunch must use RABBITMQ_SERVER_ERL_ARGS
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
-index 69474d697..6b4a94d0f 100755
+index 592446823..14c3621ef 100755
 --- a/scripts/rabbitmq-server
 +++ b/scripts/rabbitmq-server
 @@ -193,6 +193,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
@@ -14,5 +14,5 @@ index 69474d697..6b4a94d0f 100755
      -hidden \
 +    ${RABBITMQ_SERVER_ERL_ARGS} \
      -s rabbit_prelaunch \
+     ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \
      ${RABBITMQ_NAME_TYPE} ${RABBITMQ_PRELAUNCH_NODENAME} \
-     -conf_advanced "${RABBITMQ_ADVANCED_CONFIG_FILE}" \
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 710464e..f9865c8 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -6,7 +6,7 @@
 
 
 Name: rabbitmq-server
-Version: 3.7.15
+Version: 3.7.16
 Release: 1%{?dist}
 License: MPLv1.1
 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz
@@ -196,6 +196,9 @@ done
 
 
 %changelog
+* Wed Jul 24 2019 Peter Lemenkov <lemenkov@gmail.com> - 3.7.16-1
+- Ver. 3.7.16
+
 * Wed May 22 2019 Peter Lemenkov <lemenkov@gmail.com> - 3.7.15-1
 - Ver. 3.7.15
 
diff --git a/rabbitmq-server_3.7.15.orig.tar.xz.asc b/rabbitmq-server_3.7.15.orig.tar.xz.asc
deleted file mode 100644
index b1468d1..0000000
--- a/rabbitmq-server_3.7.15.orig.tar.xz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJc4KClAAoJEGtzo25gJt/K+hYP/20u2mu3sjLkvBzWWFpE2pJz
-mM5OUHDIsSFaHEfz0HyBKijelHaXgM7vDANHUaJ7uIk0C2+Q+3P1lVlpIBdfHCLA
-/50c950PfrynKf6qRISXt4cexHqcfmOyp3Rhcu9GZ5D+jhF8KmmeL/QT4bRg7IL1
-O+avovcZ/ZthXDYfjKpyi+g00J+q2e7JbY2D0LMmLsIMbBNvIhRfqlBT9QWxVCmG
-6vgdEMAfjFwezDchq8ZC410D13XqTpELKlmdJpc33+awKQRicV7pOLQuQJPxod2T
-ykZr920KP0Girv1sjYbU2s1rxcjcqy9nEce6RDIZw51Kb5vAuv2zNbisbyLAjYq+
-saR1SlJ7teXsjzKyQVgDsoLSPSJePT/CahTH1zWdprby8hT6sSsqjppOyAVlCY8Y
-7vAvcidXIM0faDcXcyLqghGGfllSLh/Cc3DqCBTJ92iS5Xq359tAXiK6mFXM6iPX
-8ugKX3GRLqasox43qqYvHQigdx67EFR0WKl14kqFVmIlF/zbyxts4tqZv7T5S3AS
-cLd/khTsQ348up90S3kpB/QBAnYDySOdh1dbLffOG3MOaCYtXq7fc8heLMPuoz1H
-1BijN8L1LPcjWqdbKDeT7IFqPnaSKdxRE8VgFGQXXGvyRzZCTm3Jus7PScZDad/J
-UtJRKtVrIefkNuuSZhE8
-=quGC
------END PGP SIGNATURE-----
diff --git a/sources b/sources
index 22854e2..d2e0434 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (rabbitmq-server_3.7.15.orig.tar.xz) = 6fe527ac9ce417ddd7cc5caeccb6bc706f7b882d7c4aea693f8c97b1b6b4ab42eed241751179e4283df3121a617792fe89950a3699d28632bb3811d8f02119df
+SHA512 (rabbitmq-server_3.7.16.orig.tar.xz) = 4fe0a197cf79e32cc7594341227c199e5f885fbc25fb8b0fe162758a3bef5da27dde1cbc0b9d102e8b7f8f119cc6350146225ff4dcfd3bb5a0b429b77e63d924
+SHA512 (rabbitmq-server_3.7.16.orig.tar.xz.asc) = 1a9f5efbf19f9858425950880ac1de0aad66f17da1e2733ee7166adf48e97fd6499cd6556c4a2c08ff6e30ce260d7279f09635f5440bede7898524ee9a076524