diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e38cbd56..7dfd6dadd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 1.7.1
+* Add oil well preset (#2618)
+* Add radio mast preset (#2613)
+* Don't commit empty changesets (#1483)
+* Add place=farm preset (#2604)
+* Cleanup strings for website and email tags (#2323)
+* Use semicolon-space as separator for opening_hours tags (#2301)
+* Clear cached userDetails when auth events occur (#2588)
+* New styling for barriers (#2592)
+* In wireframe mode, draw all points (#2591)
+* Invert background opacity widget display values (#2595)
+* Save custom background imagery layer to localstorage (#2566)
+* Better introductory help text (#2504)
+* Smarter way movement - avoid zorroing connected ways (#2516, #729)
+* Add basic browser and platform info to changeset tags (#2559, #2449)
+* Add drive_through preset to fast_food, atm, etc (#2459)
+* Use combo not checkbox for building field (#2553)
+* Fix bug with copy/paste when originals are deleted (#2557)
+* Tag motorway_link with explicit oneway=yes (#2555)
+* Map-In-Map locator (toggle with '/' key) (#2554)
+* Add service field for railways (#2552)
+* Feature filtering: don't match multipolygon lines as 'Others' (#2548)
+* Add network=* tag to public transport presets (#2549)
+* Add incline field for highway=steps preset (#2456)
+* Support node v0.12 (#2535)
+* Resolve editing conflicts before saving (#2525, #1053)
+* Don't delete ways from route, boundary, multipolygon relations (#2526, #1461)
+
 ## 1.7.0
 
 * Fix typo in smoothness field - should be "impassable" (#2523)
diff --git a/js/id/id.js b/js/id/id.js
index 6f8240017..e2e9af6c9 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -325,7 +325,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.7.0';
+iD.version = '1.7.1';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index 12a29a52c..f5b99a07e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {