diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9466b01f3..052f4ed84a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,19 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Breaking changes
 
-* Fixing #4239 means the ordering of some messages have changed.
+### Deprecations
+
+### New features
+
+### Fixed bugs
+
+
+## [0.22.0] - 2024-10-02
+
+### Breaking changes
+
+* Fixing [#4239](https://github.com/martinvonz/jj/issues/4239) means the
+  ordering of some messages have changed.
 
 * Invalid `ui.graph.style` configuration is now an error.
 
@@ -20,9 +32,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Deprecations
 
-* `jj obslog` is now called `jj evolution-log`/`jj evolog`. `jj obslog` remains
-  as an alias.
-
 * `jj branch` has been deprecated in favor of `jj bookmark`.
 
   **Rationale:** Jujutsu's branches don't behave like Git branches, which a
@@ -31,6 +40,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   that describes them better, and they also behave similar to Mercurial's
   bookmarks.
 
+* `jj obslog` is now called `jj evolution-log`/`jj evolog`. `jj obslog` remains
+  as an alias.
+
 * `jj unsquash` has been deprecated in favor of `jj squash` and
   `jj diffedit --restore-descendants`.
 
@@ -95,7 +107,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   to keeping all changes into the first commit while keeping the current commit
   description for the second commit (the newly created empty one).
 
-* Color author and committer names yellow
+* Author and committer names are now yellow by default.
 
 ### Fixed bugs
 
@@ -111,6 +123,28 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
   `present(@)` evaluates to `none()` if the current workspace has no
   working-copy commit.
 
+### Contributors
+
+Thanks to the people who made this release happen!
+
+* Austin Seipp (@thoughtpolice)
+* Danny Hooper (@hooper)
+* Emily Shaffer (@nasamuffin)
+* Essien Ita Essien (@essiene)
+* Ethan Brierley (@eopb)
+* Ilya Grigoriev (@ilyagr)
+* Kevin Liao (@kevincliao)
+* Lukas Wirth (@Veykril)
+* Martin von Zweigbergk (@martinvonz)
+* Mateusz Mikuła (@mati865)
+* mlcui (@mlcui-corp)
+* Philip Metzger (@PhilipMetzger)
+* Samuel Tardieu (@samueltardieu)
+* Stephen Jennings (@jennings)
+* Tyler Goffinet (@qubitz)
+* Vamsi Avula (@avamsi)
+* Yuya Nishihara (@yuja)
+
 ## [0.21.0] - 2024-09-04
 
 ### Breaking changes
diff --git a/Cargo.lock b/Cargo.lock
index e028ca386a..32b243e84c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -890,7 +890,7 @@ dependencies = [
 
 [[package]]
 name = "gen-protos"
-version = "0.21.0"
+version = "0.22.0"
 dependencies = [
  "prost-build",
 ]
@@ -1820,7 +1820,7 @@ dependencies = [
 
 [[package]]
 name = "jj-cli"
-version = "0.21.0"
+version = "0.22.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -1877,7 +1877,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib"
-version = "0.21.0"
+version = "0.22.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -1937,7 +1937,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib-proc-macros"
-version = "0.21.0"
+version = "0.22.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3105,7 +3105,7 @@ dependencies = [
 
 [[package]]
 name = "testutils"
-version = "0.21.0"
+version = "0.22.0"
 dependencies = [
  "async-trait",
  "config",
diff --git a/Cargo.toml b/Cargo.toml
index fb06b130fc..09a4d1cd28 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.21.0"
+version = "0.22.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.21.0" }
-jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.21.0" }
+jj-lib = { path = "lib", version = "0.22.0" }
+jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.22.0" }
 testutils = { path = "lib/testutils" }
 
 # Insta suggests compiling these packages in opt mode for faster testing.