diff --git a/.gitignore b/.gitignore
index 8d410bb..90e760e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ rabbitmq-server-1.8.0.tar.gz
/rabbitmq-server-3.5.4.tar.gz
/rabbitmq-server-3.5.5.tar.gz
/rabbitmq-server-3.5.6.tar.gz
+/rabbitmq-server-3.5.7.tar.gz
diff --git a/rabbitmq-server-0002-Recognize-help-as-a-valid-sub-command.patch b/rabbitmq-server-0002-Recognize-help-as-a-valid-sub-command.patch
deleted file mode 100644
index 6ac97bd..0000000
--- a/rabbitmq-server-0002-Recognize-help-as-a-valid-sub-command.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Fri, 23 Oct 2015 16:05:41 +0300
-Subject: [PATCH] Recognize help as a valid sub-command
-
-Some people believe that rabbitmqctl and rabbitmq-plugins should provide
-a valid help subcommand (instead of throwing an error). So here it is.
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
-index fe0563b..68d468f 100644
---- a/src/rabbit_control_main.erl
-+++ b/src/rabbit_control_main.erl
-@@ -86,7 +86,8 @@
- close_connection,
- {trace_on, [?VHOST_DEF]},
- {trace_off, [?VHOST_DEF]},
-- set_vm_memory_high_watermark
-+ set_vm_memory_high_watermark,
-+ help
- ]).
-
- -define(GLOBAL_QUERIES,
-@@ -108,7 +109,7 @@
- [stop, stop_app, start_app, wait, reset, force_reset, rotate_logs,
- join_cluster, change_cluster_node_type, update_cluster_nodes,
- forget_cluster_node, rename_cluster_node, cluster_status, status,
-- environment, eval, force_boot]).
-+ environment, eval, force_boot, help]).
-
- -define(COMMANDS_WITH_TIMEOUT,
- [list_user_permissions, list_policies, list_queues, list_exchanges,
-@@ -483,6 +484,9 @@ action(eval, Node, [Expr], _Opts, _Inform) ->
- {error_string, format_parse_error(E)}
- end;
-
-+action(help, _Node, _Args, _Opts, _Inform) ->
-+ io:format("~s", [rabbit_ctl_usage:usage()]);
-+
- action(Command, Node, Args, Opts, Inform) ->
- %% For backward compatibility, run commands accepting a timeout with
- %% the default timeout.
-diff --git a/src/rabbit_plugins_main.erl b/src/rabbit_plugins_main.erl
-index a4d5490..4aeed48 100644
---- a/src/rabbit_plugins_main.erl
-+++ b/src/rabbit_plugins_main.erl
-@@ -27,7 +27,8 @@
- {enable, [?OFFLINE_DEF, ?ONLINE_DEF]},
- {disable, [?OFFLINE_DEF, ?ONLINE_DEF]},
- {set, [?OFFLINE_DEF, ?ONLINE_DEF]},
-- {sync, []}]).
-+ {sync, []},
-+ {help, []}]).
-
- %%----------------------------------------------------------------------------
-
-@@ -147,7 +148,10 @@ action(disable, Node, ToDisable0, Opts, State = #cli{all = All,
- action_change(Opts, Node, Implicit, NewImplicit, State);
-
- action(sync, Node, [], _Opts, State) ->
-- sync(Node, true, State).
-+ sync(Node, true, State);
-+
-+action(help, _Node, _Args, _Opts, _State) ->
-+ io:format("~s", [rabbit_plugins_usage:usage()]).
-
- %%----------------------------------------------------------------------------
-
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index afa7b7b..e267b16 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -2,8 +2,8 @@
Name: rabbitmq-server
-Version: 3.5.6
-Release: 5%{?dist}
+Version: 3.5.7
+Release: 1%{?dist}
License: MPLv1.1
Group: Development/Libraries
Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -57,8 +57,6 @@ Requires(preun):initscripts
# https://bugzilla.redhat.com/show_bug.cgi?id=998682
# https://bugzilla.redhat.com/show_bug.cgi?id=1032595#c8
Patch1: rabbitmq-server-0001-Use-ephemeral-port-for-probing.patch
-# Backported from upstream - https://github.com/rabbitmq/rabbitmq-server/pull/383
-Patch2: rabbitmq-server-0002-Recognize-help-as-a-valid-sub-command.patch
%description
RabbitMQ is an implementation of AMQP, the emerging standard for high
@@ -78,7 +76,6 @@ scalable implementation of an AMQP broker.
%prep
%setup -q
%patch1 -p1 -b .ephemeral
-%patch2 -p1 -b .help_subcommand
%build
cp %{S:2} %{_rabbit_wrapper}
@@ -214,8 +211,11 @@ fi
rm -rf %{buildroot}
%changelog
+* Tue Dec 15 2015 Peter Lemenkov <lemenkov@gmail.com> - 3.5.7-1
+- New upstream release - 3.5.7
+
* Fri Dec 11 2015 Peter Lemenkov <lemenkov@gmail.com> - 3.5.6-5
-= Updated out-of-tarball scripts
+- Updated out-of-tarball scripts
* Fri Oct 23 2015 Peter Lemenkov <lemenkov@gmail.com> - 3.5.6-4
- Added help subcommand for the scripts
diff --git a/sources b/sources
index 1d9755b..e8fcb38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-254cb3793ac35d381d2eacd3252bcb3f rabbitmq-server-3.5.6.tar.gz
+7208276bd897bdc0e9aff8d5b95a0006 rabbitmq-server-3.5.7.tar.gz