diff --git a/Aliases/nim b/Aliases/nim
new file mode 120000
index 00000000000..219ac184079
--- /dev/null
+++ b/Aliases/nim
@@ -0,0 +1 @@
+../Formula/nimrod.rb
\ No newline at end of file
diff --git a/Formula/nimrod.rb b/Formula/nimrod.rb
index c8150399b26..070a338876b 100644
--- a/Formula/nimrod.rb
+++ b/Formula/nimrod.rb
@@ -1,18 +1,12 @@
 require 'formula'
 
 class Nimrod < Formula
-  homepage "http://nimrod-lang.org/"
+  homepage "http://nim-lang.org/"
 
-  stable do
-    url "http://nimrod-lang.org/download/nimrod_0.9.6.zip"
-    sha1 "a0be99cd67ca2283c6cf076bb7edee74d2f32dc5"
+  url "http://nim-lang.org/download/nim-0.10.2.zip"
+  sha1 "0a54d6d7f257cdade5bf950d318066959c48a6dc"
 
-    # This patch fixes an OS X-specific codegen issue.
-    # See http://github.com/Araq/Nimrod/issues/1701
-    patch :DATA
-  end
-
-  head "https://github.com/Araq/Nimrod.git", :branch => "devel"
+  head "https://github.com/Araq/Nim.git", :branch => "devel"
 
   bottle do
     cellar :any
@@ -22,50 +16,19 @@ class Nimrod < Formula
   end
 
   def install
-    # For some reason the mingw variable doesn't get passed through,
-    # so hardcode it. This is fixed in HEAD.
-    inreplace "compiler/nimrod.ini", "${mingw}", "mingw32" unless build.head?
-
     system "/bin/sh", "build.sh"
     system "/bin/sh", "install.sh", prefix
 
-    if build.stable?
-      (prefix/"nimrod").install "compiler"
-      bin.install_symlink prefix/"nimrod/bin/nimrod"
-    else
-      (prefix/"nim").install "compiler"
-      bin.install_symlink prefix/"nim/bin/nim"
-      bin.install_symlink prefix/"nim/bin/nim" => "nimrod"
-    end
+    (prefix/"nim").install "compiler"
+    bin.install_symlink prefix/"nim/bin/nim"
+    bin.install_symlink prefix/"nim/bin/nim" => "nimrod"
   end
 
   test do
     (testpath/"hello.nim").write <<-EOS.undent
       echo("Hi!")
     EOS
-    system "#{bin}/nimrod", "compile", "--run", "hello.nim"
+    system "#{bin}/nim", "compile", "--run", "hello.nim"
   end
 end
 
-__END__
---- a/lib/pure/concurrency/cpuinfo.nim
-+++ b/lib/pure/concurrency/cpuinfo.nim
-@@ -20,15 +20,15 @@ when defined(linux):
-   import linux
-
- when defined(freebsd) or defined(macosx):
--  {.emit:"#include <sys/types.h>".}
-+  {.emit:"#include <sys/types.h>\n".}
-
- when defined(openbsd) or defined(netbsd):
--  {.emit:"#include <sys/param.h>".}
-+  {.emit:"#include <sys/param.h>\n".}
-
- when defined(macosx) or defined(bsd):
-   # we HAVE to emit param.h before sysctl.h so we cannot use .header here
-   # either. The amount of archaic bullshit in Poonix based OSes is just insane.
--  {.emit:"#include <sys/sysctl.h>".}
-+  {.emit:"#include <sys/sysctl.h>\n".}
-   const
-     CTL_HW = 6
-     HW_AVAILCPU = 25