diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14fa8278a..281ee0331 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.21.0](https://github.com/salsa-rs/salsa/compare/salsa-v0.20.0...salsa-v0.21.0) - 2025-04-29
+
+### Fixed
+
+- Access to tracked-struct that was freed during fixpoint ([#817](https://github.com/salsa-rs/salsa/pull/817))
+- correct debug output for tracked fields ([#826](https://github.com/salsa-rs/salsa/pull/826))
+- Fix incorrect `values_equal` signature ([#825](https://github.com/salsa-rs/salsa/pull/825))
+- allow unused lifetimes in tracked_struct expansion ([#824](https://github.com/salsa-rs/salsa/pull/824))
+
+### Other
+
+- Implement a query stack `Backtrace` analog ([#827](https://github.com/salsa-rs/salsa/pull/827))
+- Simplify ID conversions ([#822](https://github.com/salsa-rs/salsa/pull/822))
+- Attempt to fix codspeed ([#823](https://github.com/salsa-rs/salsa/pull/823))
+- Remove unnecessary `Array` abstraction ([#821](https://github.com/salsa-rs/salsa/pull/821))
+- Add a compile-fail test for a `'static` `!Update` struct ([#820](https://github.com/salsa-rs/salsa/pull/820))
+- squelch most clippy warnings in generated code ([#809](https://github.com/salsa-rs/salsa/pull/809))
+- Include struct name in formatted input-field index ([#819](https://github.com/salsa-rs/salsa/pull/819))
+- Force inline `fetch_hot` ([#818](https://github.com/salsa-rs/salsa/pull/818))
+- Per ingredient sync table ([#650](https://github.com/salsa-rs/salsa/pull/650))
+- Use `DatabaseKey` for interned events ([#813](https://github.com/salsa-rs/salsa/pull/813))
+- [refactor] More `fetch_hot` simplification ([#793](https://github.com/salsa-rs/salsa/pull/793))
+- Don't store the fields in the interned map ([#812](https://github.com/salsa-rs/salsa/pull/812))
+- Fix ci not always running ([#810](https://github.com/salsa-rs/salsa/pull/810))
+
 ## [0.20.0](https://github.com/salsa-rs/salsa/compare/salsa-v0.19.0...salsa-v0.20.0) - 2025-04-22
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index 33fffd274..044cfd368 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "salsa"
-version = "0.20.0"
+version = "0.21.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.20.0", path = "components/salsa-macro-rules" }
-salsa-macros = { version = "0.20.0", path = "components/salsa-macros", optional = true }
+salsa-macro-rules = { version = "0.21.0", path = "components/salsa-macro-rules" }
+salsa-macros = { version = "0.21.0", path = "components/salsa-macros", optional = true }
 
 boxcar = "0.2.11"
 crossbeam-queue = "0.3.11"
@@ -42,7 +42,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.20.0", path = "components/salsa-macros" }
+salsa-macros = { version = "=0.21.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 138c55a39..f37675dfc 100644
--- a/components/salsa-macro-rules/CHANGELOG.md
+++ b/components/salsa-macro-rules/CHANGELOG.md
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.21.0](https://github.com/salsa-rs/salsa/compare/salsa-macro-rules-v0.20.0...salsa-macro-rules-v0.21.0) - 2025-04-29
+
+### Fixed
+
+- correct debug output for tracked fields ([#826](https://github.com/salsa-rs/salsa/pull/826))
+- allow unused lifetimes in tracked_struct expansion ([#824](https://github.com/salsa-rs/salsa/pull/824))
+
+### Other
+
+- Implement a query stack `Backtrace` analog ([#827](https://github.com/salsa-rs/salsa/pull/827))
+- Simplify ID conversions ([#822](https://github.com/salsa-rs/salsa/pull/822))
+- Remove unnecessary `Array` abstraction ([#821](https://github.com/salsa-rs/salsa/pull/821))
+- Add a compile-fail test for a `'static` `!Update` struct ([#820](https://github.com/salsa-rs/salsa/pull/820))
+- squelch most clippy warnings in generated code ([#809](https://github.com/salsa-rs/salsa/pull/809))
+
 ## [0.20.0](https://github.com/salsa-rs/salsa/compare/salsa-macro-rules-v0.19.0...salsa-macro-rules-v0.20.0) - 2025-04-22
 
 ### Added
diff --git a/components/salsa-macro-rules/Cargo.toml b/components/salsa-macro-rules/Cargo.toml
index e61ec0983..18820050d 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.20.0"
+version = "0.21.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 e76a3e4b1..ba2d12be3 100644
--- a/components/salsa-macros/CHANGELOG.md
+++ b/components/salsa-macros/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.21.0](https://github.com/salsa-rs/salsa/compare/salsa-macros-v0.20.0...salsa-macros-v0.21.0) - 2025-04-29
+
+### Fixed
+
+- allow unused lifetimes in tracked_struct expansion ([#824](https://github.com/salsa-rs/salsa/pull/824))
+
+### Other
+
+- Add a compile-fail test for a `'static` `!Update` struct ([#820](https://github.com/salsa-rs/salsa/pull/820))
+- squelch most clippy warnings in generated code ([#809](https://github.com/salsa-rs/salsa/pull/809))
+- Use `DatabaseKey` for interned events ([#813](https://github.com/salsa-rs/salsa/pull/813))
+
 ## [0.20.0](https://github.com/salsa-rs/salsa/compare/salsa-macros-v0.19.0...salsa-macros-v0.20.0) - 2025-04-22
 
 ### Added
diff --git a/components/salsa-macros/Cargo.toml b/components/salsa-macros/Cargo.toml
index 191cd211c..c19f5a2bb 100644
--- a/components/salsa-macros/Cargo.toml
+++ b/components/salsa-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "salsa-macros"
-version = "0.20.0"
+version = "0.21.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true