diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a54bffbb..39bb82e36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,43 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#prxxxx]: https://github.com/openstreetmap/iD/pull/xxxx
 -->
 
+# 2.20.1
+##### 2021-Aug-17
+
+#### :sparkles: Usability & Accessibility
+* Splash message now links to changelog instead of inactive ideditor.blog ([#8604])
+* Maxar Premium imagery - new url ([#pr8623])
+
+[#8604]: https://github.com/openstreetmap/iD/issues/8604
+[#pr8623]: https://github.com/openstreetmap/iD/pull/8623
+
+#### :bug: Bugfixes
+* Fix NSI (name suggestion index) bug where tagging warning recommended removing tags considered as 'primary' ([#8615])
+* Fix NSI bug where matching was done based on 'old_name' tag ([#8617])
+* Fix NSI bug where route master was not included in certain validations ([#pr8627])
+* Fix Validator bug where pre-existing issues were treated as current/edited issues ([#8613], [#8632])
+* Fix Validator bug where 'fix-me' requests were being treated as outstanding issues ([#8603])
+
+[#8615]: https://github.com/openstreetmap/iD/issues/8615
+[#8617]: https://github.com/openstreetmap/iD/issues/8617
+[#pr8627]: https://github.com/openstreetmap/iD/pull/8627
+[#8613]: https://github.com/openstreetmap/iD/issues/8613
+[#8632]: https://github.com/openstreetmap/iD/issues/8632
+[#8603]: https://github.com/openstreetmap/iD/issues/8603
+
+#### :white_check_mark: Validation
+* Crossing ways - Smarter node repurposing ([#pr8625])
+* Improve focusing on an issue ([#pr8626], [#pr8638])
+
+[#pr8625]: https://github.com/openstreetmap/iD/pull/8625
+[#pr8626]: https://github.com/openstreetmap/iD/pull/8626
+[#pr8638]: https://github.com/openstreetmap/iD/pull/8638
+
+#### :hammer: Development
+* Switch from @mapbox/togeojson to more maintained @tmcw/togeojson ([#pr8636])
+
+[#pr8636]: https://github.com/openstreetmap/iD/pull/8636
+
 # 2.20.0
 ##### 2021-Jul-20
 
diff --git a/modules/core/context.js b/modules/core/context.js
index 042dc18f7..d63d1892a 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -26,7 +26,7 @@ export function coreContext() {
   let context = utilRebind({}, dispatch, 'on');
   let _deferred = new Set();
 
-  context.version = '2.20.1-dev';
+  context.version = '2.20.1';
   context.privacyVersion = '20201202';
 
   // iD will alter the hash so cache the parameters intended to setup the session
diff --git a/package.json b/package.json
index 86add9801..fc2a6149f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "2.20.1-dev",
+  "version": "2.20.1",
   "description": "A friendly editor for OpenStreetMap",
   "main": "dist/iD.min.js",
   "repository": "github:openstreetmap/iD",