diff --git a/README.md b/README.md
index c920667000..1097e36a63 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,10 @@ CoffeeScript is a little language that compiles into JavaScript.
 
 ## Installation
 
-If you have the node package manager, npm, installed:
+Once you have Node.js installed:
 
 ```shell
-npm install --global coffee-script
+npm install --global coffeescript
 ```
 
 Leave off the `--global` if you don’t wish to install globally.
diff --git a/documentation/examples/modules.coffee b/documentation/examples/modules.coffee
index 2a0679e60b..9138f447d1 100644
--- a/documentation/examples/modules.coffee
+++ b/documentation/examples/modules.coffee
@@ -1,5 +1,5 @@
 import 'local-file.coffee'
-import 'coffee-script'
+import 'coffeescript'
 
 import _ from 'underscore'
 import * as underscore from 'underscore'
diff --git a/documentation/sections/changelog.md b/documentation/sections/changelog.md
index eaf15b2e80..719cc5102f 100644
--- a/documentation/sections/changelog.md
+++ b/documentation/sections/changelog.md
@@ -1,5 +1,18 @@
 ## Change Log
 
+```
+releaseHeader('2017-05-15', '1.12.6', '1.12.5')
+```
+
+*   The `return` and `export` keywords can now accept implicit objects (defined by indentation, without needing braces).
+*   Support Unicode code point escapes (e.g. `\u{1F4A9}`).
+*   The `coffee` command now first looks to see if CoffeeScript is installed under `node_modules` in the current folder, and executes the `coffee` binary there if so; or otherwise it runs the globally installed one. This allows you to have one version of CoffeeScript installed globally and a different one installed locally for a particular project. (Likewise for the `cake` command.)
+*   Bugfixes for chained function calls not closing implicit objects or ternaries.
+*   Bugfixes for incorrect code generated by the `?` operator within a termary `if` statement.
+*   Now `cake build:browser` just creates the browser build, without also running tests on it. New task `cake build:browser:full` creates the browser build and then tests it.
+*   Failing tests now result in a nonzero exit code.
+*   Fixed a too-permissive “reserved words” test, and fixed a REPL test that was broken in Node < 6.
+
 ```
 releaseHeader('2017-04-10', '1.12.5', '1.12.4')
 ```
diff --git a/documentation/sections/installation.md b/documentation/sections/installation.md
index 6446bc88e4..1d986b879b 100644
--- a/documentation/sections/installation.md
+++ b/documentation/sections/installation.md
@@ -5,11 +5,15 @@ The command-line version of `coffee` is available as a [Node.js](https://nodejs.
 To install, first make sure you have a working copy of the latest stable version of [Node.js](https://nodejs.org/). You can then install CoffeeScript globally with [npm](https://www.npmjs.com/):
 
 ```bash
-npm install --global coffee-script
+npm install --global coffeescript
 ```
 
+This will make the `coffee` and `cake` commands available globally.
+
 When you need CoffeeScript as a dependency of a project, within that project’s folder you can install it locally:
 
 ```bash
-npm install --save coffee-script
+npm install --save coffeescript
 ```
+
+The `coffee` and `cake` commands will first look in the current folder to see if CoffeeScript is installed locally, and use that version if so. This allows different versions of CoffeeScript to be installed globally and locally.
\ No newline at end of file
diff --git a/documentation/sections/introduction.md b/documentation/sections/introduction.md
index a077c82a87..27d001c9a7 100644
--- a/documentation/sections/introduction.md
+++ b/documentation/sections/introduction.md
@@ -7,7 +7,7 @@ The CoffeeScript compiler goes to great lengths to generate output JavaScript th
 **Latest Version:** [<%= fullVersion %>](https://github.com/jashkenas/coffeescript/tarball/<%= fullVersion %>)
 
 ```bash
-npm install -g coffee-script
+npm install -g coffeescript
 ```
 
 **CoffeeScript 2 is coming!** It adds support for [ES2015 classes](/v2/#classes), [`async`/`await`](/v2/#fat-arrow), and generates JavaScript using ES2015+ syntax. <a href="/v2/">Learn more</a>.</p>
diff --git a/package.json b/package.json
index a2d3bc5932..1bbb176d29 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "compiler"
   ],
   "author": "Jeremy Ashkenas",
-  "version": "1.12.5",
+  "version": "1.12.6",
   "license": "MIT",
   "engines": {
     "node": ">=0.8.0"