diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab8a9755aa2..6df6fa3db6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,27 +2,39 @@
 
 An in-progress version being developed in the `master` branch.
 
+## 0.12.0 (Dec 2 2015)
+
+#### API Improvements
+
+* Added `line-offset` style property (#1778)
+
 ## 0.11.5 (Dec 1 2015)
 
 #### Bugfixes
 
-* Draw layers sorted by their order in they stylesheet (#1558)
+* Fixed unstable symbol layer render order when adding / removing layers (#1558)
+* Fire map loaded event even if raster tiles have errors
+* Fix panning animation during easeTo with zoom change
+* Fix pitching animation during flyTo
+* Fix pitching animation during easeTo
+* Prevent rotation from firing `mouseend` events (#1104)
 
 #### API Improvements
 
 * Fire `mousedown` and `mouseup` events (#1411)
 * Fire `movestart` and `moveend` when panning (#1658)
 * Added drag events (#1442)
+* Request webp images for mapbox:// raster tiles in chrome (#1725)
 
 #### UX Improvements
 
-* Request webp images for mapbox:// raster tiles in chrome
+* Added inertia to map rotation (#620)
 
 ## 0.11.4 (Nov 16 2015)
 
 #### Bugfixes
 
-* Fix alpha blending of alpha layers  (#1684)
+* Fix alpha blending of alpha layers (#1684)
 
 ## 0.11.3 (Nov 10 2015)
 
diff --git a/README.md b/README.md
index 6e287f67b4e..54efec9a1ed 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ A WebGL JavaScript interactive maps library that can render [Mapbox Vector Tiles
 Include the source via HTML tags:
 
 ```html
-<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.5/mapbox-gl.js'></script>
-<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.5/mapbox-gl.css' rel='stylesheet' />
+<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.js'></script>
+<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.css' rel='stylesheet' />
 ```
 
 For more information, see the [API documentation](https://www.mapbox.com/mapbox-gl-js/api/) and [examples](https://www.mapbox.com/mapbox-gl-js/examples/).
@@ -82,14 +82,15 @@ To prepare a release:
 
 * Merge `mb-pages` into `master`:
   * `git checkout master && git merge origin/mb-pages`
-* Update `CHANGELOG.md`
+* Update `CHANGELOG.md` with all changes since the last release
 * Update the version number in `package.json`, `README.md`, `bench/fps/site.js`, `_config.yml`, and `_config.mb-pages.yml`
 * Commit changes
-* Tag the release (`git tag vX.Y.Z && git push origin --tags`). The CI server will automatically publish tagged builds to the Mapbox CDN.
-* Publish the build to npm (`npm publish`)
+* Run `npm version patch` (or `major`, or `minor`) to bump the version number
+* Run `git push origin --tags`. The CI server will automatically publish tagged builds to the Mapbox CDN.
+* Run `npm publish` to publish the build to npm.
 * Merge `master` into `mb-pages` and publish documentation:
   * `git checkout mb-pages && git merge master && git push origin mb-pages`
-* [Create a GitHub release](https://github.com/mapbox/mapbox-gl-js/releases/new)
+* [Create a GitHub release](https://github.com/mapbox/mapbox-gl-js/releases/new) using the CHANGELOG
 
 ## [Style Reference](https://www.mapbox.com/mapbox-gl-style-spec/)
 
diff --git a/_config.mb-pages.yml b/_config.mb-pages.yml
index c68f2be376f..c347a913b2b 100755
--- a/_config.mb-pages.yml
+++ b/_config.mb-pages.yml
@@ -6,7 +6,7 @@ permalink: /:categories/:title
 baseurl: /mapbox-gl-js
 highlighter: pygments
 excerpt_separator: ""
-version: v0.11.5
+version: v0.12.0
 rdiscount:
   extensions: [smart]
 exclude: [dist]
diff --git a/_config.yml b/_config.yml
index 413a927988e..cbd0eb47ab2 100755
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,7 @@ permalink: /:categories/:title
 baseurl: /mapbox-gl-js
 highlighter: pygments
 excerpt_separator: ""
-version: v0.11.5
+version: v0.12.0
 mapboxglbase: /mapbox-gl-js/dist
 rdiscount:
   extensions: [smart]
diff --git a/bench/fps/site.js b/bench/fps/site.js
index cae53529abd..b21ac56637d 100644
--- a/bench/fps/site.js
+++ b/bench/fps/site.js
@@ -1,9 +1,9 @@
 var urls = [
     'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
-    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.5/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.js',
     '/dist/mapbox-gl.js',
     'https://api.tiles.mapbox.com/mapbox-gl-js/v0.10.0/mapbox-gl.js',
-    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.5/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.0/mapbox-gl.js',
     '/dist/mapbox-gl.js'
 ];
 
diff --git a/package.json b/package.json
index f01ce676686..babb8db35e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mapbox-gl",
   "description": "A WebGL interactive maps library",
-  "version": "0.11.5",
+  "version": "0.12.0",
   "main": "js/mapbox-gl.js",
   "license": "BSD-3-Clause",
   "repository": {