diff --git a/Formula/rabbitmq.rb b/Formula/rabbitmq.rb
index 875113b0cee..1bdf98cd317 100644
--- a/Formula/rabbitmq.rb
+++ b/Formula/rabbitmq.rb
@@ -2,15 +2,14 @@ require 'formula'
 
 class Rabbitmq <Formula
   homepage 'http://rabbitmq.com'
-  url 'http://www.rabbitmq.com/releases/rabbitmq-server/v1.7.0/rabbitmq-server-1.7.0.tar.gz'
-  md5 '4505ca0fd8718439bd6f5e2af2379e56'
+  url 'http://mirror.rabbitmq.com/releases/rabbitmq-server/v1.7.2/rabbitmq-server-1.7.2.tar.gz'
+  md5 'fb83be3b1577cdd54459012b85b7631d'
 
   depends_on 'erlang'
   depends_on 'simplejson' => :python if MACOS_VERSION < 10.6
 
   def install
-    erlang_libdir = lib + "rabbitmq" + "erlang" + "lib"
-    target_dir = "#{erlang_libdir}/rabbitmq-#{version}"
+    target_dir = "#{lib}/rabbitmq/erlang/lib/rabbitmq-#{version}"
     system "make"
     ENV['TARGET_DIR'] = target_dir
     ENV['MAN_DIR'] = man
@@ -18,13 +17,14 @@ class Rabbitmq <Formula
     system "make install"
 
     (etc + "rabbitmq").mkpath
-    (var + "lib" + "rabbitmq").mkpath
-    (var + "log" + "couchdb").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|
         contents.gsub! '/etc/rabbitmq', "#{etc}/rabbitmq"
-        contents.gsub! '/var/((log|lib)/rabbitmq)', "#{var}/\1"
+        contents.gsub! '/var/lib/rabbitmq', "#{var}/lib/rabbitmq"
+        contents.gsub! '/var/log/rabbitmq', "#{var}/log/rabbitmq"
       end
     end