diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e33b8844..9776ea14a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,22 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@xxxx]: https://github.com/xxxx
 -->
 
+# 2.3.1
+##### July 11, 2017
+
+#### :sparkles: Usability
+
+* Display left click icon for "Place a point" on keyboard shortcuts screen
+
+#### :bug: Bugfixes
+
+* Don't lose the imagery offset when switching between "Custom" and another background imagery layer ([#3982])
+* After splitting a way, update all matching relation members (fix for broken u-turn relations) ([#4140])
+
+[#3982]: https://github.com/openstreetmap/iD/issues/3982
+[#4140]: https://github.com/openstreetmap/iD/issues/4140
+
+
 # 2.3.0
 ##### July 7, 2017
 
diff --git a/modules/core/context.js b/modules/core/context.js
index e1364cf13..ca0ac127e 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -24,7 +24,7 @@ export function setAreaKeys(value) {
 
 export function coreContext() {
     var context = {};
-    context.version = '2.3.0';
+    context.version = '2.3.1';
 
     // create a special translation that contains the keys in place of the strings
     var tkeys = _.cloneDeep(dataEn);
diff --git a/package.json b/package.json
index 3af32df05..c0db32413 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "A friendly editor for OpenStreetMap",
   "main": "iD.js",
   "repository": "openstreetmap/iD",