diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6429a38312..e23998f941b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+## 0.36.0 (April 19, 2017)
+
+#### New features :sparkles:
+
+- Replace LogoControl logo with the new Mapbox logo #4598
+
+#### Bug fixes :bug:
+
+- Fix bug with the BoxZoomHandler that made it glitchy if it is enabled after the DragPanHandler #4528
+- Fix undefined behavior in `fill_outline` shaders #4600
+- Fix `Camera#easeTo` interpolation on pitched maps #4540
+- Choose property function interpolation method by the `property`'s type #4614
+
+#### Development workflow improvements :nerd_face:
+
+- Fix crash on missing `style.json` in integration tests
+- `gl-style-composite` is now executable in line with the other tools @andrewharvey #4595
+- `gl-style-composite` utility now throws an error if a name conflict would occur between layers @andrewharvey #4595
+
 ## 0.35.1 (April 12, 2017)
 
 #### Bug fixes :bug:
diff --git a/package.json b/package.json
index d920cf71525..b213f818992 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mapbox-gl",
   "description": "A WebGL interactive maps library",
-  "version": "0.35.1",
+  "version": "0.36.0",
   "main": "dist/mapbox-gl.js",
   "license": "BSD-3-Clause",
   "repository": {