diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 796e16c2a..000000000
--- a/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-Copyright 2014 GitHub, Inc.
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 000000000..4d231b456
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,20 @@
+Copyright (c) 2014 GitHub Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 0da6b54ed..67c148500 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
-# Atom — The hackable editor
+# Atom — A hackable text editor for the 21st Century
 
 ![Atom](https://cloud.githubusercontent.com/assets/72919/2874231/3af1db48-d3dd-11e3-98dc-6066f8bc766f.png)
 
-Check out our [guides and API documentation](https://atom.io/docs/latest).
+Atom is an open source text editor built on top of
+[atom-shell](http://github.com/atom/atom-shell). It's designed to be
+customizable, but also usable without needing to edit a config file. Atom is
+modern, approachable, and hackable to the core. Visit [atom.io](http://atom.io)
+to learn more.
 
 ## Installing
 
@@ -12,6 +16,11 @@ Atom will automatically update when a new release is available.
 
 ## Building
 
-Follow the instructions in the [build docs][building].
+```sh
+git clone git@github.com:atom/atom.git
+cd atom
+script/build # Creates application at /Applications/Atom.app
+```
 
-[building]: https://github.com/atom/atom/blob/master/docs/building-atom.md
+## Developing
+Check out the [guides](https://atom.io/docs/latest) and the [API reference](atom.io/docs/api).
diff --git a/build/package.json b/build/package.json
index 346024d2b..5cfdb1b63 100644
--- a/build/package.json
+++ b/build/package.json
@@ -18,7 +18,7 @@
     "grunt-contrib-coffee": "~0.9.0",
     "grunt-contrib-less": "~0.8.0",
     "grunt-cson": "0.8.0",
-    "grunt-download-atom-shell": "git+https://atom-bot:467bac80a0017b96fb5be5cfc686f5e0cc607b10@github.com/atom/grunt-download-atom-shell#v0.6.1",
+    "grunt-download-atom-shell": "~0.6.1",
     "grunt-lesslint": "0.13.0",
     "grunt-markdown": "~0.4.0",
     "grunt-peg": "~1.1.0",
diff --git a/package.json b/package.json
index faa753586..987510de6 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,12 @@
   "bugs": {
     "url": "https://github.com/atom/atom/issues"
   },
-  "license": "All Rights Reserved",
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
+    }
+  ],
   "atomShellVersion": "0.12.0",
   "dependencies": {
     "async": "0.2.6",
diff --git a/src/workspace.coffee b/src/workspace.coffee
index ed2acd8c3..daf142fee 100644
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -116,7 +116,7 @@ class Workspace extends Model
 
   # Public: Open Atom's license in the active pane.
   openLicense: ->
-    @open(join(atom.getLoadSettings().resourcePath, 'LICENSE'))
+    @open(join(atom.getLoadSettings().resourcePath, 'LICENSE.md'))
 
   # Synchronously open the given URI in the active pane. **Only use this method
   # in specs. Calling this in production code will block the UI thread and