diff --git a/.gitignore b/.gitignore
index 19ee106..6d29ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ rabbitmq-server-1.8.0.tar.gz
/rabbitmq-server-3.1.2.tar.gz
/rabbitmq-server-3.1.3.tar.gz
/rabbitmq-server-3.1.5.tar.gz
+/rabbitmq-server-3.3.5.tar.gz
diff --git a/rabbitmq-server-0001-Add-systemd-notify-support.patch b/rabbitmq-server-0001-Add-systemd-notify-support.patch
deleted file mode 100644
index e16e492..0000000
--- a/rabbitmq-server-0001-Add-systemd-notify-support.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7c4364a25d6b42df1624cb223b83f053f1a1b70a Mon Sep 17 00:00:00 2001
-From: John Eckersberg <jeckersb@redhat.com>
-Date: Mon, 16 Jun 2014 14:57:27 -0400
-Subject: [PATCH 1/1] Add systemd notify support
-
-Conflicts:
- src/rabbit.erl
----
- src/rabbit.erl | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/rabbit.erl b/src/rabbit.erl
-index 2baec88..8f52d16 100644
---- a/src/rabbit.erl
-+++ b/src/rabbit.erl
-@@ -336,6 +336,7 @@ boot() ->
- false),
- ok = app_utils:start_applications(
- StartupApps, fun handle_app_error/2),
-+ ok = notify_startup(),
- ok = log_broker_started(Plugins)
- end).
-
-@@ -774,3 +775,19 @@ start_fhc() ->
- rabbit_sup:start_restartable_child(
- file_handle_cache,
- [fun rabbit_alarm:set_alarm/1, fun rabbit_alarm:clear_alarm/1]).
-+
-+have_systemd_notify() ->
-+ try sd_notify:module_info() of
-+ _InfoList ->
-+ true
-+ catch
-+ _:_ ->
-+ false
-+ end.
-+
-+notify_startup() ->
-+ case have_systemd_notify() of
-+ true ->
-+ sd_notify:sd_notify(0, "READY=1");
-+ _ -> ok
-+ end.
---
-1.9.0
-
diff --git a/rabbitmq-server-systemd-notify-support.patch b/rabbitmq-server-systemd-notify-support.patch
new file mode 100644
index 0000000..2d50de1
--- /dev/null
+++ b/rabbitmq-server-systemd-notify-support.patch
@@ -0,0 +1,21 @@
+diff -Naur rabbitmq-server-3.3.5.orig/src/rabbit.erl rabbitmq-server-3.3.5/src/rabbit.erl
+--- rabbitmq-server-3.3.5.orig/src/rabbit.erl 2014-08-27 09:33:37.404506484 -0400
++++ rabbitmq-server-3.3.5/src/rabbit.erl 2014-08-27 09:34:51.800243321 -0400
+@@ -314,6 +314,8 @@
+ rabbit_mnesia:check_cluster_consistency(),
+ ok = app_utils:start_applications(
+ app_startup_order(), fun handle_app_error/2),
++ {module, sd_notify} == code:load_file(sd_notify) andalso
++ sd_notify:sd_notify(0, "READY=1"),
+ ok = log_broker_started(rabbit_plugins:active())
+ end).
+
+@@ -336,6 +338,8 @@
+ false),
+ ok = app_utils:start_applications(
+ StartupApps, fun handle_app_error/2),
++ {module, sd_notify} == code:load_file(sd_notify) andalso
++ sd_notify:sd_notify(0, "READY=1"),
+ ok = log_broker_started(Plugins)
+ end).
+
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index b60196f..29b2f08 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -2,8 +2,8 @@
Name: rabbitmq-server
-Version: 3.1.5
-Release: 9%{?dist}
+Version: 3.3.5
+Release: 1%{?dist}
License: MPLv1.1
Group: Development/Libraries
Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -54,7 +54,7 @@ Requires(preun):initscripts
Patch0: rabbitmq-probe-ephemeral-port.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1103524
-Patch1: rabbitmq-server-0001-Add-systemd-notify-support.patch
+Patch1: rabbitmq-server-systemd-notify-support.patch
%description
RabbitMQ is an implementation of AMQP, the emerging standard for high
@@ -87,7 +87,8 @@ rm -rf %{buildroot}
make install TARGET_DIR=%{_maindir} \
SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
- MAN_DIR=%{buildroot}%{_mandir}
+ MAN_DIR=%{buildroot}%{_mandir} \
+ DOC_INSTALL_DIR=%{buildroot}%{_pkgdocdir}
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
@@ -205,6 +206,11 @@ done
rm -rf %{buildroot}
%changelog
+* Wed Aug 27 2014 John Eckersberg <jeckersb@redhat.com> - 3.3.5-1
+- New upstream release - 3.3.5
+- Updated systemd notify support patch to match implementation from
+ couchdb (Thanks Peter Lemenkov for the much more concise patch!)
+
* Wed Jul 02 2014 John Eckersberg <jeckersb@redhat.com> - 3.1.5-9
- Add systemd notify support (RHBZ#1103524)
diff --git a/sources b/sources
index 23ffe6f..63756e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a412e0d9dcba1e926981a71ee41ccfc rabbitmq-server-3.1.5.tar.gz
+3bf0c4be1aaa6fdb483470aba14a6c81 rabbitmq-server-3.3.5.tar.gz