diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7396befe3e..337361285a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 0.12.4 (Jan 19 2016)
+
+#### Bugfixes
+
+Fix elementGroups null value errors (#1933)
+Fix some glyph atlas overflow cases (#1923)
+
 ## 0.12.3 (Jan 14 2016)
 
 #### API Improvements
diff --git a/README.md b/README.md
index dcfed3b72fc..0330e803ef9 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.12.3/mapbox-gl.js'></script>
-<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.3/mapbox-gl.css' rel='stylesheet' />
+<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/mapbox-gl.js'></script>
+<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/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/).
@@ -83,7 +83,7 @@ To prepare a release:
 * Run `git checkout master && git merge origin/mb-pages` to merge `mb-pages` into `master`
 * Update `CHANGELOG.md` with all changes since the last release. A list of commits is available on the [GitHub Releases page](https://github.com/mapbox/mapbox-gl-js/releases) through a link that says "X commits to master since this release"
 * Update the version number in `package.json`, `README.md`, `bench/fps/site.js`, `_config.yml`, and `_config.mb-pages.yml`
-* Run `git commit -m "vX.Y.Z"` to commit changes
+* Run `git commit -a -m "vX.Y.Z"` to commit changes
 * Run `git tag vX.Y.Z` to tag the release
 * Run `git push origin && git push origin --tags` to push the new commit and tag to GitHub
 * Create a [GitHub release](https://github.com/mapbox/mapbox-gl-js/releases/new) using the tag you just pushed and the text in `CHANGELOG.md`
diff --git a/_config.mb-pages.yml b/_config.mb-pages.yml
index fbcccdae87f..b6a39815eef 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.12.3
+version: v0.12.4
 rdiscount:
   extensions: [smart]
 exclude: [dist]
diff --git a/_config.yml b/_config.yml
index 74581b353a1..62b544e9577 100755
--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,7 @@ permalink: /:categories/:title
 baseurl: /mapbox-gl-js
 highlighter: pygments
 excerpt_separator: ""
-version: v0.12.3
+version: v0.12.4
 mapboxglbase: /mapbox-gl-js/dist
 rdiscount:
   extensions: [smart]
diff --git a/bench/fps/site.js b/bench/fps/site.js
index 3710ee65c88..3b763006d85 100644
--- a/bench/fps/site.js
+++ b/bench/fps/site.js
@@ -1,9 +1,7 @@
 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.12.3/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/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.12.3/mapbox-gl.js',
+    'https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.4/mapbox-gl.js',
     '/dist/mapbox-gl.js'
 ];
 
diff --git a/package.json b/package.json
index 7591816499f..a68655dd4a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mapbox-gl",
   "description": "A WebGL interactive maps library",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "main": "js/mapbox-gl.js",
   "license": "BSD-3-Clause",
   "repository": {