Merge branch 'master' of github.com:cweagans/neovim into cweagans-master

Conflicts:
	README.md

2 files changed, 21 insertions, 9 deletions

diff --git a/README.md b/README.md
index 20f8341d1b..87919c7027 100644
--- a/README.md
+++ b/README.md
@@ -185,17 +185,9 @@ and what is currently being worked on:
 
 #### For OS X:
 
-* Install [Xcode](https://developer.apple.com/)
+* Install [Xcode](https://developer.apple.com/) and [Homebrew][http://brew.sh]
 * Install sha1sum
 
-  Via MacPorts:
-
-      sudo port install md5sha1sum cmake libtool automake
-
-  Via Homebrew:
-
-      brew install md5sha1sum cmake libtool automake
-
 If you run into wget certificate errors, you may be missing the root SSL
 certificates or have not set them up correctly:
 
@@ -223,6 +215,10 @@ To build and run the tests:
 
     make test
 
+Using Homebrew on Mac:
+
+    brew install neovim/neovim/neovim
+
 ### Community
 
 Join the community on IRC in #neovim on Freenode.
diff --git a/neovim.rb b/neovim.rb
new file mode 100644
index 0000000000..45e8b4018a
--- /dev/null
+++ b/neovim.rb
@@ -0,0 +1,16 @@
+require 'formula'
+
+class Neovim < Formula
+  homepage 'http://neovim.org'
+  head 'https://github.com/neovim/neovim.git'
+
+  depends_on 'md5sha1sum'
+  depends_on 'cmake'
+  depends_on 'libtool'
+  depends_on 'automake'
+
+  def install
+    system "make", "PREFIX=#{prefix}", "cmake"
+    system "make", "PREFIX=#{prefix}"
+  end
+end