diff --git a/Formula/emacs.rb b/Formula/emacs.rb
index 78a3b3676bf..45e29ea9cc4 100644
--- a/Formula/emacs.rb
+++ b/Formula/emacs.rb
@@ -1,10 +1,15 @@
 require 'formula'
 
+class Magit <Formula
+  url 'http://zagadka.vm.bytemark.co.uk/magit/magit-0.7.tar.gz'
+  md5 '1ea442bd6f83f7ac82967059754c8c87'
+  homepage 'http://zagadka.vm.bytemark.co.uk/magit/'
+end
+
 class Emacs <Formula
   if ARGV.include? "--cocoa"
-    # 98643 is the same bzr rev as the old git sha db44e1e
-    # but both bzr@98643 and bzr@trunk fail with 'digest-doc' not found
-    head 'bzr://http://bzr.savannah.gnu.org/r/emacs/trunk', :tag => '98643'
+    # tested bazaar revision: 99478
+    head 'bzr://http://bzr.savannah.gnu.org/r/emacs/trunk'
   else
     url 'http://ftp.gnu.org/pub/gnu/emacs/emacs-23.1.tar.bz2'
     head 'bzr://http://bzr.savannah.gnu.org/r/emacs/trunk'
@@ -12,6 +17,12 @@ class Emacs <Formula
   end
   homepage 'http://www.gnu.org/software/emacs/'
 
+  def options
+    [
+      ["--cocoa", "Build a cocoa version of emacs"],
+    ]
+  end
+
   def caveats
     "Use --cocoa to build a Cocoa binary Emacs.app from HEAD.
 
@@ -33,21 +44,33 @@ $HOME/Library/Caches/Homebrew/emacs-HEAD/
   end
 
   def install
+    configure_args = [
+      "--prefix=#{prefix}",
+      "--disable-debug",
+      "--disable-dependency-tracking",
+      "--without-dbus",
+      "--enable-locallisppath=#{HOMEBREW_PREFIX}/share/emacs/site-lisp",
+    ]
+
+    # segfault in --cocoa
+    ENV.gcc_4_2
+
     if ARGV.include? "--cocoa"
-      system "./configure", "--prefix=#{prefix}",
-  			  "--disable-debug",
-  			  "--disable-dependency-tracking",
-  			  "--with-ns", "--disable-ns-self-contained"
-  		system "make bootstrap"
-  		system "make install"
-  		prefix.install "nextstep/Emacs.app"
+      configure_args << "--with-ns" << "--disable-ns-self-contained"
+      system "./configure", *configure_args
+      system "make bootstrap"
+      system "make install"
+      prefix.install "nextstep/Emacs.app"
     else
-      system "./configure", "--prefix=#{prefix}",
-  			  "--disable-debug",
-  			  "--disable-dependency-tracking",
-  			  "--without-x"
-  		system "make"
-  		system "make install"
+      configure_args << "--without-x"
+      system "./configure", *configure_args
+      system "make"
+      system "make install"
+    end
+
+    Magit.new.brew do
+      system "./configure", "--prefix=#{prefix}"
+      system "make install"
     end
   end
 end