diff --git a/no-remove-common.patch b/no-remove-common.patch
index 0765244..39e3381 100644
--- a/no-remove-common.patch
+++ b/no-remove-common.patch
@@ -1,6 +1,8 @@
---- Makefile.orig	2013-03-13 11:32:13.354753804 +0100
-+++ Makefile	2013-03-13 11:32:32.695820378 +0100
-@@ -110,7 +110,6 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -120,7 +120,6 @@ plugins:
  	mkdir -p $(PLUGINS_DIR)
  	PLUGINS_SRC_DIR="" $(MAKE) -C "$(PLUGINS_SRC_DIR)" plugins-dist PLUGINS_DIST_DIR="$(CURDIR)/$(PLUGINS_DIR)" VERSION=$(VERSION)
  	echo "Put your EZs here and use rabbitmq-plugins to enable them." > $(PLUGINS_DIR)/README
diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index c595811..b1616b6 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 24 13:22:48 UTC 2015 - dmueller@suse.com
+
+- rabbitmq-server.service: switch to type=Notify in order to
+  avoid cookie creation race
+
 -------------------------------------------------------------------
 Tue Jun 23 17:26:24 UTC 2015 - tbechtold@suse.com
 
diff --git a/rabbitmq-server.service b/rabbitmq-server.service
index 55e31d6..5aa1a36 100644
--- a/rabbitmq-server.service
+++ b/rabbitmq-server.service
@@ -4,15 +4,12 @@ After=epmd.socket syslog.target network.target
 Requires=epmd.socket
 
 [Service]
-Type=simple
+Type=notify
 User=rabbitmq
 Group=rabbitmq
-Environment=RABBITMQ_PID_FILE=/var/run/rabbitmq/pid
 WorkingDirectory=/var/lib/rabbitmq
 ExecStart=/usr/sbin/rabbitmq-server
-ExecStartPost=/usr/sbin/rabbitmqctl wait /var/run/rabbitmq/pid
 ExecStop=/usr/sbin/rabbitmqctl stop
-ExecStopPost=/usr/bin/rm /var/run/rabbitmq/pid
 
 [Install]
 WantedBy=multi-user.target