diff --git a/CHANGELOG.md b/CHANGELOG.md
index 062911f81..d65749dc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,19 @@ _Breaking changes, which may affect downstream projects or sites that embed iD,
 [@xxxx]: https://github.com/xxxx
 -->
 
+# 2.12.1
+##### 2018-Dec-05
+
+#### :bug: Bugfixes
+* Fix bug preventing walkthrough from starting ([#5553], [#5555], thanks [@quincylvania])
+* Fix bug causing tooltips on background pane not to disappear ([#5551])
+
+[#5555]: https://github.com/openstreetmap/iD/issues/5555
+[#5553]: https://github.com/openstreetmap/iD/issues/5553
+[#5551]: https://github.com/openstreetmap/iD/issues/5551
+[@quincylvania]: https://github.com/quincylvania
+
+
 # 2.12.0
 ##### 2018-Dec-03
 
diff --git a/modules/core/context.js b/modules/core/context.js
index 5197cb4c9..af57f8793 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -33,7 +33,7 @@ export function setAreaKeys(value) {
 
 export function coreContext() {
     var context = {};
-    context.version = '2.12.0';
+    context.version = '2.12.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 07c7ddaa4..d1deba245 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "2.12.0",
+  "version": "2.12.1",
   "description": "A friendly editor for OpenStreetMap",
   "main": "iD.js",
   "repository": "openstreetmap/iD",