diff --git a/.gitignore b/.gitignore
index b87f74b..4d1c690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ rabbitmq-server-1.8.0.tar.gz
 /rabbitmq-server-3.6.6.tar.xz
 /rabbitmq-server-3.6.9.tar.xz
 /rabbitmq-server-3.6.10.tar.xz
+/rabbitmq-server-3.6.12.tar.xz
diff --git a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch
index cb9a286..a85f7b4 100644
--- a/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch
+++ b/rabbitmq-common-0001-Use-proto_dist-from-command-line.patch
@@ -10,11 +10,11 @@ first one.
 
 Signed-off-by: Peter Lemenkov <lemenkov@redhat.com>
 
-diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl
-index 84069f3..218f789 100644
---- a/src/rabbit_nodes.erl
-+++ b/src/rabbit_nodes.erl
-@@ -221,9 +221,14 @@ set_cluster_name(Name) ->
+diff --git a/src/rabbit_nodes_common.erl b/src/rabbit_nodes_common.erl
+index a385a42..afa99ae 100644
+--- a/src/rabbit_nodes_common.erl
++++ b/src/rabbit_nodes_common.erl
+@@ -37,9 +37,14 @@ parts(NodeStr) ->
  ensure_epmd() ->
      {ok, Prog} = init:get_argument(progname),
      ID = rabbit_misc:random(1000000000),
diff --git a/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch b/rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch
index 6a3091d..cf3bcfe 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 d328a78d4..9a21d22b5 100644
+index fbd8840c3..b16b13785 100644
 --- a/src/rabbit.erl
 +++ b/src/rabbit.erl
 @@ -293,121 +293,8 @@ broker_start() ->
diff --git a/rabbitmq-server-0002-Add-systemd-notification-support.patch b/rabbitmq-server-0002-Add-systemd-notification-support.patch
index 9c0ec0b..78efecf 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 9a21d22b5..af2b95194 100644
+index b16b13785..f76501a40 100644
 --- a/src/rabbit.erl
 +++ b/src/rabbit.erl
 @@ -293,6 +293,11 @@ broker_start() ->
diff --git a/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch b/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch
index d926724..4a94c31 100644
--- a/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch
+++ b/rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch
@@ -4,10 +4,10 @@ Subject: [PATCH] Allow guest login from non-loopback connections
 
 
 diff --git a/Makefile b/Makefile
-index 0ea8dcaa0..0bef7901f 100644
+index 3e3f3b23e..559d59f05 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -35,7 +35,7 @@ define PROJECT_ENV
+@@ -36,7 +36,7 @@ define PROJECT_ENV
  	    {default_user_tags, [administrator]},
  	    {default_vhost, <<"/">>},
  	    {default_permissions, [<<".*">>, <<".*">>, <<".*">>]},
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index caf3153..6149e6d 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -1,13 +1,12 @@
-%global erlang_minver R12B-3
+%global erlang_minver 18
 # We want to install into /usr/lib, even on 64-bit platforms
 %global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
 
 
 Name: rabbitmq-server
-Version: 3.6.10
-Release: 2%{?dist}
+Version: 3.6.12
+Release: 1%{?dist}
 License: MPLv1.1
-Group: Development/Libraries
 Source0: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.xz
 # curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server/231e90c/scripts/rabbitmq-script-wrapper
 # sed -i -e "s, @STDOUT_STDERR_REDIRECTION@,,g" rabbitmq-script-wrapper
@@ -15,6 +14,7 @@ Source0: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{
 Source2: rabbitmq-script-wrapper
 # curl -O https://raw.githubusercontent.com/lemenkov/rabbitmq-server/cdfc661/packaging/RPMS/Fedora/rabbitmq-server.logrotate
 Source3: rabbitmq-server.logrotate
+# curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server-release/rabbitmq_v3_6_12/packaging/RPMS/Fedora/rabbitmq-server.tmpfiles
 Source5: rabbitmq-server.tmpfiles
 Patch1: rabbitmq-server-0001-Remove-excessive-sd_notify-code.patch
 Patch2: rabbitmq-server-0002-Add-systemd-notification-support.patch
@@ -184,6 +184,9 @@ done
 
 
 %changelog
+* Tue Sep 19 2017 Peter Lemenkov <lemenkov@gmail.com> - 3.6.12-1
+- Ver. 3.6.12
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index a4f285c..0fa7a83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rabbitmq-server-3.6.10.tar.xz) = 64e618e51ab259463029ad75b981dbf64687515e52d19854f225d4c68077e683ef56f0f6bb92cbbf91f140bc829d905473d687d083d12f36dd2cdfab3defaed6
+SHA512 (rabbitmq-server-3.6.12.tar.xz) = 8d447815f6a4f732260f690b651758fb7372ca0fd1f21cec0a82790788cbc6193ab64813160183956b8e1a6d0bad64ff38cad7be7e5bbb90791d390a48ef2151