diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 227980c..e10f3a3 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -18,6 +18,12 @@ shuts down or is otherwise considered to be unavailable by peers
   + Default max number of channels allowed on a connection (a.k.a. channel_max) has been lowered from 65535 to 2047.
 The new default is much safer and will reduce the effect application channel leaks have on node resource consumption. This is a potentially breaking change.
 
+-------------------------------------------------------------------
+Tue Jun 12 09:56:10 UTC 2018 - jtomasiak@suse.com
+
+- Add sysexits-in-ocf.patch to handle new rabbitmqctl exit codes
+  (bsc#1093046)
+
 -------------------------------------------------------------------
 Mon May 28 13:08:15 UTC 2018 - bwiedemann@suse.com
 
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index d17080d..48c1d23 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -50,6 +50,9 @@ Source6:        rabbitmq-server.service
 Source7:        rabbitmq-server.tmpfiles.d.conf
 Source8:        README.SUSE
 Source9:        rabbitmq.config.example
+# PATCH-FIX-UPSTREAM sysexists-in-ocf bsc#1093046
+# https://github.com/rabbitmq/rabbitmq-server-release/pull/80
+Patch0:         sysexists-in-ocf.patch
 BuildRequires:  erlang
 BuildRequires:  erlang-src
 BuildRequires:  fdupes
@@ -115,6 +118,7 @@ This package includes the RabbitMQ AMQP language bindings for Erlang.
 %prep
 %setup -q
 cp %{SOURCE8} .
+%patch0 -p1
 
 %build
 make all %{_make_args} %{?_smp_mflags}
diff --git a/sysexists-in-ocf.patch b/sysexists-in-ocf.patch
new file mode 100644
index 0000000..b5282de
--- /dev/null
+++ b/sysexists-in-ocf.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/rabbitmq-server.ocf b/scripts/rabbitmq-server.ocf
+index cf832fe..176d2a7 100755
+--- a/scripts/rabbitmq-server.ocf
++++ b/scripts/rabbitmq-server.ocf
+@@ -275,7 +275,7 @@ rabbitmqctl_action() {
+             ocf_log debug "RabbitMQ server is running normally"
+             return $OCF_SUCCESS
+             ;;
+-        1|2)
++        1|2|69)
+             ocf_log debug "RabbitMQ server is not running"
+             return $OCF_NOT_RUNNING
+             ;;