diff --git a/no-remove-common.patch b/no-remove-common.patch
index 6cb75ac..0765244 100644
--- a/no-remove-common.patch
+++ b/no-remove-common.patch
@@ -1,12 +1,10 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -110,7 +110,6 @@ plugins:
+--- Makefile.orig	2013-03-13 11:32:13.354753804 +0100
++++ Makefile	2013-03-13 11:32:32.695820378 +0100
+@@ -110,7 +110,6 @@
  	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
 -	rm -f $(PLUGINS_DIR)/rabbit_common*.ez
- else
- plugins:
- # Not building plugins
+ 
+ # add -q to remove printout of warnings....
+ check-xref: $(BEAM_TARGETS) $(PLUGINS_DIR)
diff --git a/rabbitmq-server-2.8.7.tar.gz b/rabbitmq-server-2.8.7.tar.gz
deleted file mode 100644
index d940972..0000000
--- a/rabbitmq-server-2.8.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0726e126896abbe30d9fd491d13eb16afa15327a548a3de9c3a31d41adcaccfc
-size 2792978
diff --git a/rabbitmq-server-3.0.4.tar.gz b/rabbitmq-server-3.0.4.tar.gz
new file mode 100644
index 0000000..4d27f5c
--- /dev/null
+++ b/rabbitmq-server-3.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e49dbcfd8b2085133847de33081e2defb1f4879d21a9776d54ab1f1988e0e163
+size 3314866
diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 35b52e4..e11f867 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Wed Mar 13 11:28:33 CET 2013 - berendt@b1-systems.de
+
+- updated to version 3.0.4
+  * 3.0.4: This release fixes a bug in the federation plugin
+    where upstream credentials were leaked in the
+    x-received-from header. This bug had been in the federation
+    plugin since RabbitMQ 3.0.0. There are no other changes
+    from RabbitMQ 3.0.3.
+  * 3.0.3: This release fixes a small number of bugs in 3.0.2
+    and earlier versions.
+  * 3.0.2: This release fixes a number of bugs in 3.0.1 and
+    earlier versions.
+  * 3.0.1: This release fixes a number of bugs in 3.0.0 and
+    earlier versions.
+  * 3.0.0: This release introduces dynamic, policy-based control
+    of mirroring and federation, improves the user friendliness
+    of clustering, adds support for per-message TTL, introduces
+    plugins for web-STOMP and MQTT, and adds many smaller new
+    features and bug fixes.
+- rebased no-remove-common.patch
+
 -------------------------------------------------------------------
 Fri Dec 14 13:11:56 UTC 2012 - rhafer@suse.com
 
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index f2f9e48..b13536d 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -24,7 +24,7 @@
 %endif
 
 Name:           rabbitmq-server
-Version:        2.8.7
+Version:        3.0.4
 Release:        0
 Summary:        The RabbitMQ Server
 License:        MPL-1.1