diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e5282a10..cf6e25f7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 1.2.0
+
+* Don't auto-save intro tutorial edits (#1745, #1795)
+* Added waypoint display to GPX layer
+* Added "Straighten" operation
+* Improve "Orthogonalize" behavior, rename to "Square"
+* Add and improve many presets
+* Save commit messages on blur (#1783)
+* Add KSJ2 tags to discard list (#1794)
+* Fix display of labels with wide characters
+* Catch localStorage quota exception (#1807)
+* Avoid consecutive identical nodes when adding a midpoint (#1296)
+* Stop nudge when exiting move mode (#1766)
+* Add "Continue" operation
+* Delete relations that become empty (#465, #1454)
+* Support polygon imagery bounds (#768)
+* Pull imagery from editor-imagery-index
+* Insert areas in sorted order (#1693)
+* Fix some walkthrough glitches (#1744)
+
 ## 1.1.6
 
 * Fix walkthrough on Firefox (#1743)
diff --git a/js/id/id.js b/js/id/id.js
index f253af4f5..b526fc5a8 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -253,7 +253,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.1.6';
+iD.version = '1.2.0';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index d93b30281..7fae810a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {