diff --git a/Formula/rabbitmq.rb b/Formula/rabbitmq.rb
index 6de11472a48..461ea14becc 100644
--- a/Formula/rabbitmq.rb
+++ b/Formula/rabbitmq.rb
@@ -2,15 +2,14 @@ require 'formula'
 
 class Rabbitmq <Formula
   homepage 'http://rabbitmq.com'
-  url 'http://mirror.rabbitmq.com/releases/rabbitmq-server/v1.8.1/rabbitmq-server-1.8.1.tar.gz'
-  md5 '2471bdf0ba77b73aed1cc8eddc10aa19'
+  url 'http://mirror.rabbitmq.com/releases/rabbitmq-server/v2.0.0/rabbitmq-server-2.0.0.tar.gz'
+  md5 '04b99018085d4156b404d56377fc1c62'
 
   depends_on 'erlang'
   depends_on 'simplejson' => :python if MACOS_VERSION < 10.6
 
   def patches
-    # remove man pages pending necessary formulae to build them:
-    # xmlto, gnu-getopts, docbook-xml, docbook-xsl, docbook-4.5
+    # Can't build manpages without a lot of other junk, so disable
     DATA
   end
 
@@ -22,9 +21,9 @@ class Rabbitmq <Formula
     ENV['SBIN_DIR'] = sbin
     system "make install"
 
-    (etc + "rabbitmq").mkpath
-    (var + "lib/rabbitmq").mkpath
-    (var + "log/rabbitmq").mkpath
+    (etc+'rabbitmq').mkpath
+    (var+'lib/rabbitmq').mkpath
+    (var+'log/rabbitmq').mkpath
 
     %w{rabbitmq-server rabbitmq-multi rabbitmqctl rabbitmq-env}.each do |script|
       inreplace sbin+script do |contents|
@@ -42,19 +41,19 @@ end
 
 __END__
 diff --git a/Makefile b/Makefile
-index a66d064..c774720 100644
+index 46b1842..82d71a0 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -253,7 +253,7 @@ $(SOURCE_DIR)/%_usage.erl:
- 
+@@ -265,7 +265,7 @@ $(SOURCE_DIR)/%_usage.erl:
+
  docs_all: $(MANPAGES) $(WEB_MANPAGES)
- 
+
 -install: all docs_all install_dirs
 +install: all install_dirs
  	cp -r ebin include LICENSE LICENSE-MPL-RabbitMQ INSTALL $(TARGET_DIR)
- 
+
  	chmod 0755 scripts/*
-@@ -261,12 +261,6 @@ install: all docs_all install_dirs
+@@ -273,12 +273,6 @@ install: all docs_all install_dirs
  		cp scripts/$$script $(TARGET_DIR)/sbin; \
  		[ -e $(SBIN_DIR)/$$script ] || ln -s $(SCRIPTS_REL_PATH)/$$script $(SBIN_DIR)/$$script; \
  	done
@@ -64,6 +63,6 @@ index a66d064..c774720 100644
 -			cp $$manpage $(MAN_DIR)/man$$section; \
 -		done; \
 -	done
- 
- install_dirs:
- 	@ OK=true && \
+ 	mkdir -p $(TARGET_DIR)/plugins
+ 	echo Put your .ez plugin files in this directory. > $(TARGET_DIR)/plugins/README
+