diff --git a/CHANGELOG.md b/CHANGELOG.md
index 859b617309..ce294db897 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
 ## [Unreleased]
 
 ### Breaking changes
 
+### Deprecations
+
+### New features
+
+### Fixed bugs
+
+## [0.21.0] - 2024-09-04
+
+### Breaking changes
+
 * `next/prev` will no longer infer when to go into edit mode when moving from
   commit to commit. It now either follows the flags `--edit|--no-edit` or it
   gets the mode from `ui.movement.edit`.
@@ -43,6 +54,27 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   broken due to using a sunset version of GitHub's macOS runners (but nobody had
   previously complained.)
 
+### Contributors
+
+Thanks to the people who made this release happen!
+
+* Aaron Bull Schaefer (@elasticdog)
+* Austin Seipp (@thoughtpolice)
+* Benjamin Tan (@bnjmnt4n)
+* Raniz Daniel Raneland (@Raniz85)
+* Daniel Ploch (@torquestomp)
+* Essien Ita Essien (@essiene)
+* Ilya Grigoriev (@ilyagr)
+* Kaleb Pace (@kalebpace)
+* Marie (@NyCodeGHG)
+* Marijan Smetko (@InCogNiTo124)
+* Martin von Zweigbergk (@martinvonz)
+* Matt Kulukundis (@fowles)
+* Scott Taylor (@scott2000)
+* Stephen Jennings (@jennings)
+* tingerrr (@tingerrr)
+* Yuya Nishihara (@yuja)
+
 ## [0.20.0] - 2024-08-07
 
 ### Note to packagers
diff --git a/Cargo.lock b/Cargo.lock
index cb96c368b6..4bde3c46f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -890,7 +890,7 @@ dependencies = [
 
 [[package]]
 name = "gen-protos"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "prost-build",
 ]
@@ -1814,7 +1814,7 @@ dependencies = [
 
 [[package]]
 name = "jj-cli"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -1872,7 +1872,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -1932,7 +1932,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib-proc-macros"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3093,7 +3093,7 @@ dependencies = [
 
 [[package]]
 name = "testutils"
-version = "0.20.0"
+version = "0.21.0"
 dependencies = [
  "async-trait",
  "config",
diff --git a/Cargo.toml b/Cargo.toml
index 7b121b0c05..55e4cf1190 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
 
 [workspace.package]
-version = "0.20.0"
+version = "0.21.0"
 license = "Apache-2.0"
 rust-version = "1.76"                                 # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix
 edition = "2021"
@@ -128,8 +128,8 @@ zstd = "0.12.4"
 # put all inter-workspace libraries, i.e. those that use 'path = ...' here in
 # their own (alphabetically sorted) block
 
-jj-lib = { path = "lib", version = "0.20.0" }
-jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.20.0" }
+jj-lib = { path = "lib", version = "0.21.0" }
+jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.21.0" }
 testutils = { path = "lib/testutils" }
 
 # Insta suggests compiling these packages in opt mode for faster testing.