diff --git a/.gitignore b/.gitignore
index fbcf5fe..7679c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ rabbitmq-server-1.8.0.tar.gz
 /rabbitmq-server-3.6.10.tar.xz
 /rabbitmq-server-3.6.12.tar.xz
 /rabbitmq-server-3.6.14.tar.xz
+/rabbitmq-server-3.6.15.tar.xz
diff --git a/rabbitmq-script-wrapper b/rabbitmq-script-wrapper
deleted file mode 100644
index 3d2fc49..0000000
--- a/rabbitmq-script-wrapper
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-##  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-2015 Pivotal Software, Inc.  All rights reserved.
-##
-
-SED_OPT="-E"
-if [ $(uname -s) = "Linux" ]; then
-    SED_OPT="-r"
-fi
-
-for arg in "$@" ; do
-    # Wrap each arg in single quotes and wrap single quotes in double quotes, so that they're passed through cleanly.
-    arg=`printf %s "$arg" | sed $SED_OPT -e "s/'/'\"'\"'/g"`
-    CMDLINE="${CMDLINE} '${arg}'"
-done
-
-cd /var/lib/rabbitmq
-
-SCRIPT=`basename $0`
-
-if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then
-    RABBITMQ_ENV=/usr/lib/rabbitmq/bin/rabbitmq-env
-    RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV")
-    . "$RABBITMQ_ENV"
-
-    exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@"
-elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
-    if [ -f $PWD/.erlang.cookie ] ; then
-        export HOME=.
-    fi
-    exec /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
-elif [ `id -u` = 0 ] ; then
-    su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
-else
-    /usr/lib/rabbitmq/bin/${SCRIPT}
-    echo
-    echo "Only root or rabbitmq should run ${SCRIPT}"
-    echo
-    exit 1
-fi
diff --git a/rabbitmq-server-release-0001-Don-t-use-templates.patch b/rabbitmq-server-release-0001-Don-t-use-templates.patch
new file mode 100644
index 0000000..2a03997
--- /dev/null
+++ b/rabbitmq-server-release-0001-Don-t-use-templates.patch
@@ -0,0 +1,27 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 8 Feb 2018 17:06:41 +0300
+Subject: [PATCH] Don't use templates
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/scripts/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper
+index f7333dc..801323b 100644
+--- a/scripts/rabbitmq-script-wrapper
++++ b/scripts/rabbitmq-script-wrapper
+@@ -30,14 +30,14 @@ if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then
+     RABBITMQ_SCRIPTS_DIR=$(dirname "$RABBITMQ_ENV")
+     . "$RABBITMQ_ENV"
+ 
+-    exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@
++    exec /usr/lib/rabbitmq/bin/rabbitmq-server "$@"
+ elif [ \( `id -u` = `id -u rabbitmq` -a "$SCRIPT" != "rabbitmq-plugins" \) -o \( `id -u` = 0 -a "$SCRIPT" = "rabbitmq-plugins" \) ] ; then
+     if [ -f $PWD/.erlang.cookie ] ; then
+         export HOME=.
+     fi
+     exec /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+ elif [ `id -u` = 0 ] ; then
+-    @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
++    su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
+ else
+     /usr/lib/rabbitmq/bin/${SCRIPT}
+     echo
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index beb34a3..450398c 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -4,23 +4,20 @@
 
 
 Name: rabbitmq-server
-Version: 3.6.14
+Version: 3.6.15
 Release: 1%{?dist}
 License: MPLv1.1
 Source0: https://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
-# sed -i -e "s,@SU_RABBITMQ_SH_C@,su rabbitmq -s /bin/sh -c,g" rabbitmq-script-wrapper
-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
+# curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server-release/rabbitmq_v3_6_15/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
 Patch3: rabbitmq-server-0003-Allow-guest-login-from-non-loopback-connections.patch
 Patch4: rabbitmq-server-0004-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch
 Patch101: rabbitmq-common-0001-Use-proto_dist-from-command-line.patch
+Patch201: rabbitmq-server-release-0001-Don-t-use-templates.patch
 
 URL: https://www.rabbitmq.com/
 BuildArch: noarch
@@ -66,6 +63,8 @@ cd deps/rabbit_common
 %patch101 -p1
 cd ../..
 
+%patch201 -p1
+
 # We have to remove it until common_test subpackage lands RHOS
 rm -f \
 	deps/amqp_client/src/rabbit_ct_client_helpers.erl \
@@ -95,9 +94,9 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
 
 #Copy all necessary lib files etc.
 install -p -D -m 0644 ./deps/rabbit/docs/rabbitmq-server.service.example %{buildroot}%{_unitdir}/%{name}.service
-install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmqctl
-install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-server
-install -p -D -m 0755 %{S:2} %{buildroot}%{_sbindir}/rabbitmq-plugins
+install -p -D -m 0755 ./scripts/rabbitmq-script-wrapper %{buildroot}%{_sbindir}/rabbitmqctl
+install -p -D -m 0755 ./scripts/rabbitmq-script-wrapper %{buildroot}%{_sbindir}/rabbitmq-server
+install -p -D -m 0755 ./scripts/rabbitmq-script-wrapper %{buildroot}%{_sbindir}/rabbitmq-plugins
 
 # Make necessary symlinks
 mkdir -p %{buildroot}%{_rabbit_libdir}/bin
@@ -153,9 +152,6 @@ done
 %postun
 %systemd_postun_with_restart %{name}.service
 
-# Fix root:root ownership for config-files (recursively)
-%triggerun -- %{name} < 3.5.7-3
-/usr/bin/chown -R rabbitmq:rabbitmq %{_sysconfdir}/rabbitmq
 
 %files
 %dir %attr(0755, rabbitmq, rabbitmq) %{_sysconfdir}/rabbitmq
@@ -174,7 +170,7 @@ done
 %dir %attr(0750, rabbitmq, rabbitmq) %{_localstatedir}/lib/rabbitmq
 %dir %attr(0750, rabbitmq, rabbitmq) %{_localstatedir}/log/rabbitmq
 %dir %attr(0755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq
-%doc LICENSE LICENSE-*
+%license LICENSE LICENSE-*
 %{_mandir}/man1/rabbitmq-plugins.1*
 %{_mandir}/man1/rabbitmq-server.1*
 %{_mandir}/man1/rabbitmqctl.1*
@@ -182,6 +178,9 @@ done
 
 
 %changelog
+* Thu Feb 08 2018 Peter Lemenkov <lemenkov@gmail.com> - 3.6.15-1
+- Ver. 3.6.15
+
 * Tue Nov 14 2017 Peter Lemenkov <lemenkov@gmail.com> - 3.6.14-1
 - Ver. 3.6.14
 
diff --git a/sources b/sources
index 321de03..79a3330 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rabbitmq-server-3.6.14.tar.xz) = 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
+SHA512 (rabbitmq-server-3.6.15.tar.xz) = c8e15e1638d1bc6a65cbc69db46ec0c06f7078304d0997256e0379570b7256928c6565b0d7880aa12d7436fa58d6abc8a38a76b3a1fb3599033377abbabb2a46