diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ef4ca981..e2bed8501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.0](https://github.com/MichaReiser/salsa/compare/salsa-v0.21.1...salsa-v0.22.0) - 2025-05-20
+
+### Fixed
+
+- fix memo table growth condition ([#850](https://github.com/MichaReiser/salsa/pull/850))
+- incorrect caching for queries participating in fixpoint ([#843](https://github.com/MichaReiser/salsa/pull/843))
+- change detection for fixpoint queries ([#836](https://github.com/MichaReiser/salsa/pull/836))
+
+### Other
+
+- Implement an `!Update` bound escape hatch for tracked fn ([#867](https://github.com/MichaReiser/salsa/pull/867))
+- Only enable `boxcar/loom` when `loom` feature is enabled ([#869](https://github.com/MichaReiser/salsa/pull/869))
+- Remove default `PartialOrd` and `Ord` derives for salsa-structs ([#868](https://github.com/MichaReiser/salsa/pull/868))
+- update boxcar ([#865](https://github.com/MichaReiser/salsa/pull/865))
+- speed-up cycle-retry logic ([#861](https://github.com/MichaReiser/salsa/pull/861))
+- Fix returns(deref | as_ref | as_deref) in tracked methods ([#857](https://github.com/MichaReiser/salsa/pull/857))
+- Changed `return_ref` syntax to `returns(as_ref)` and `returns(cloned)` ([#772](https://github.com/MichaReiser/salsa/pull/772))
+- Work around a rust-analyzer bug ([#855](https://github.com/MichaReiser/salsa/pull/855))
+- Lazy finalization of cycle participants in `maybe_changed_after` ([#854](https://github.com/MichaReiser/salsa/pull/854))
+- Do not re-verify already verified memoized value in cycle verification ([#851](https://github.com/MichaReiser/salsa/pull/851))
+- Pass cycle heads as out parameter for `maybe_changed_after` ([#852](https://github.com/MichaReiser/salsa/pull/852))
+- Move salsa event system into `Zalsa` ([#849](https://github.com/MichaReiser/salsa/pull/849))
+- gate loom dependency under feature flag ([#844](https://github.com/MichaReiser/salsa/pull/844))
+- Add loom support ([#842](https://github.com/MichaReiser/salsa/pull/842))
+- Clean up some unsafety ([#830](https://github.com/MichaReiser/salsa/pull/830))
+
 ## [0.21.1](https://github.com/salsa-rs/salsa/compare/salsa-v0.21.0...salsa-v0.21.1) - 2025-04-30
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index d30865613..3e58fb8dd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "salsa"
-version = "0.21.1"
+version = "0.22.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -9,8 +9,8 @@ rust-version.workspace = true
 description = "A generic framework for on-demand, incrementalized computation (experimental)"
 
 [dependencies]
-salsa-macro-rules = { version = "0.21.1", path = "components/salsa-macro-rules" }
-salsa-macros = { version = "0.21.1", path = "components/salsa-macros", optional = true }
+salsa-macro-rules = { version = "0.22.0", path = "components/salsa-macro-rules" }
+salsa-macros = { version = "0.22.0", path = "components/salsa-macros", optional = true }
 
 boxcar = { version = "0.2.12" }
 crossbeam-queue = "0.3.11"
@@ -44,7 +44,7 @@ macros = ["dep:salsa-macros"]
 # which may ultimately result in odd issues due to the proc-macro
 # output mismatching with the declarative macro inputs
 [target.'cfg(any())'.dependencies]
-salsa-macros = { version = "=0.21.1", path = "components/salsa-macros" }
+salsa-macros = { version = "=0.22.0", path = "components/salsa-macros" }
 
 [dev-dependencies]
 # examples
diff --git a/components/salsa-macro-rules/CHANGELOG.md b/components/salsa-macro-rules/CHANGELOG.md
index 56f430ae2..7c7def2a4 100644
--- a/components/salsa-macro-rules/CHANGELOG.md
+++ b/components/salsa-macro-rules/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.0](https://github.com/MichaReiser/salsa/compare/salsa-macro-rules-v0.21.1...salsa-macro-rules-v0.22.0) - 2025-05-20
+
+### Other
+
+- Remove default `PartialOrd` and `Ord` derives for salsa-structs ([#868](https://github.com/MichaReiser/salsa/pull/868))
+- Fix returns(deref | as_ref | as_deref) in tracked methods ([#857](https://github.com/MichaReiser/salsa/pull/857))
+- Changed `return_ref` syntax to `returns(as_ref)` and `returns(cloned)` ([#772](https://github.com/MichaReiser/salsa/pull/772))
+- Move salsa event system into `Zalsa` ([#849](https://github.com/MichaReiser/salsa/pull/849))
+- Add loom support ([#842](https://github.com/MichaReiser/salsa/pull/842))
+- Clean up some unsafety ([#830](https://github.com/MichaReiser/salsa/pull/830))
+
 ## [0.21.1](https://github.com/salsa-rs/salsa/compare/salsa-macro-rules-v0.21.0...salsa-macro-rules-v0.21.1) - 2025-04-30
 
 ### Other
diff --git a/components/salsa-macro-rules/Cargo.toml b/components/salsa-macro-rules/Cargo.toml
index 4997495b0..2c8c11f4b 100644
--- a/components/salsa-macro-rules/Cargo.toml
+++ b/components/salsa-macro-rules/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "salsa-macro-rules"
-version = "0.21.1"
+version = "0.22.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
diff --git a/components/salsa-macros/CHANGELOG.md b/components/salsa-macros/CHANGELOG.md
index ba2d12be3..8fa64e63c 100644
--- a/components/salsa-macros/CHANGELOG.md
+++ b/components/salsa-macros/CHANGELOG.md
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.0](https://github.com/MichaReiser/salsa/compare/salsa-macros-v0.21.1...salsa-macros-v0.22.0) - 2025-05-20
+
+### Other
+
+- Implement an `!Update` bound escape hatch for tracked fn ([#867](https://github.com/MichaReiser/salsa/pull/867))
+- Fix returns(deref | as_ref | as_deref) in tracked methods ([#857](https://github.com/MichaReiser/salsa/pull/857))
+- Changed `return_ref` syntax to `returns(as_ref)` and `returns(cloned)` ([#772](https://github.com/MichaReiser/salsa/pull/772))
+- Move salsa event system into `Zalsa` ([#849](https://github.com/MichaReiser/salsa/pull/849))
+
 ## [0.21.0](https://github.com/salsa-rs/salsa/compare/salsa-macros-v0.20.0...salsa-macros-v0.21.0) - 2025-04-29
 
 ### Fixed
diff --git a/components/salsa-macros/Cargo.toml b/components/salsa-macros/Cargo.toml
index e9757c724..3990b2bda 100644
--- a/components/salsa-macros/Cargo.toml
+++ b/components/salsa-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "salsa-macros"
-version = "0.21.1"
+version = "0.22.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true