diff --git a/rtic-macros/CHANGELOG.md b/rtic-macros/CHANGELOG.md
index e1a7ef394c4..b9b8fa585cd 100644
--- a/rtic-macros/CHANGELOG.md
+++ b/rtic-macros/CHANGELOG.md
@@ -7,11 +7,15 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
 
 ## [Unreleased]
 
+## [v2.1.3] - 2025-06-08
+
+### Changed 
+
 - Unstable support for ESP32-C6
 - Adapt `slic` backends to new version with `mecall`
 - Allow software tasks to be diverging (return `!`) and give them `'static` context.
 
-## [v2.1.1] - 2024-12-06
+## [v2.1.1 & v2.1.2] - 2024-12-06
 
 ### Changed
 
diff --git a/rtic-macros/Cargo.toml b/rtic-macros/Cargo.toml
index a7d91337849..c38f575ed47 100644
--- a/rtic-macros/Cargo.toml
+++ b/rtic-macros/Cargo.toml
@@ -22,7 +22,7 @@ name = "rtic-macros"
 readme = "../README.md"
 repository = "https://github.com/rtic-rs/rtic"
 
-version = "2.1.2"
+version = "2.1.3"
 
 [package.metadata.docs.rs]
 features = ["test-template"]
diff --git a/rtic/CHANGELOG.md b/rtic/CHANGELOG.md
index 6b7ff15549e..3752a3b564b 100644
--- a/rtic/CHANGELOG.md
+++ b/rtic/CHANGELOG.md
@@ -20,6 +20,8 @@ Example:
 
 ## [Unreleased]
 
+## [v2.1.3] - 2025-06-08
+
 ### Fixed
 
 - Task executors were not required to be 'static, allowing spawn to reference the stack of the spawnee.
@@ -635,48 +637,3 @@ Yanked due to a soundness issue in `init`; the issue has been mostly fixed in v0
 ## v0.1.0 - 2017-05-09
 
 - Initial release
-
-[Unreleased]: https://github.com/rtic-rs/rtic/compare/v2.0.1...HEAD
-[v2.0.1]: https://github.com/rtic-rs/rtic/compare/v2.0.0...v2.0.1
-[v2.0.0]: https://github.com/rtic-rs/rtic/compare/v1.1.4...v2.0.0
-[v1.1.4]: https://github.com/rtic-rs/rtic/compare/v1.1.3...v1.1.4
-[v1.1.3]: https://github.com/rtic-rs/rtic/compare/v1.1.2...v1.1.3
-[v1.1.2]: https://github.com/rtic-rs/rtic/compare/v1.1.1...v1.1.2
-[v1.1.1]: https://github.com/rtic-rs/rtic/compare/v1.1.0...v1.1.1
-[v1.1.0]: https://github.com/rtic-rs/rtic/compare/v1.0.0...v1.1.0
-[v1.0.0]: https://github.com/rtic-rs/rtic/compare/v0.6.0-rc.4...v1.0.0
-[v0.6.0-rc.4]: https://github.com/rtic-rs/rtic/compare/v0.6.0-rc.3...v0.6.0-rc.4
-[v0.6.0-rc.3]: https://github.com/rtic-rs/rtic/compare/v0.6.0-rc.2...v0.6.0-rc.3
-[v0.6.0-rc.2]: https://github.com/rtic-rs/rtic/compare/v0.6.0-rc.1...v0.6.0-rc.2
-[v0.6.0-rc.1]: https://github.com/rtic-rs/rtic/compare/v0.6.0-rc.0...v0.6.0-rc.1
-[v0.6.0-rc.0]: https://github.com/rtic-rs/rtic/compare/v0.6.0-alpha.5...v0.6.0-rc.0
-[v0.6.0-alpha.5]: https://github.com/rtic-rs/rtic/compare/v0.6.0-alpha.4...v0.6.0-alpha.5
-[v0.6.0-alpha.4]: https://github.com/rtic-rs/rtic/compare/v0.6.0-alpha.3...v0.6.0-alpha.4
-[v0.6.0-alpha.3]: https://github.com/rtic-rs/rtic/compare/v0.6.0-alpha.2...v0.6.0-alpha.3
-[v0.6.0-alpha.2]: https://github.com/rtic-rs/rtic/compare/v0.6.0-alpha.1...v0.6.0-alpha.2
-[v0.6.0-alpha.1]: https://github.com/rtic-rs/rtic/compare/v0.6.0-alpha.0...v0.6.0-alpha.1
-[v0.6.0-alpha.0]: https://github.com/rtic-rs/rtic/compare/v0.5.5...v0.6.0-alpha.0
-[v0.5.x unreleased]: https://github.com/rtic-rs/rtic/compare/v0.5.8...v0.5.x
-[v0.5.9]: https://github.com/rtic-rs/rtic/compare/v0.5.8...v0.5.9
-[v0.5.8]: https://github.com/rtic-rs/rtic/compare/v0.5.7...v0.5.8
-[v0.5.7]: https://github.com/rtic-rs/rtic/compare/v0.5.6...v0.5.7
-[v0.5.6]: https://github.com/rtic-rs/rtic/compare/v0.5.5...v0.5.6
-[v0.5.5]: https://github.com/rtic-rs/rtic/compare/v0.5.4...v0.5.5
-[v0.5.4]: https://github.com/rtic-rs/rtic/compare/v0.5.3...v0.5.4
-[v0.5.3]: https://github.com/rtic-rs/rtic/compare/v0.5.2...v0.5.3
-[v0.5.2]: https://github.com/rtic-rs/rtic/compare/v0.5.1...v0.5.2
-[v0.5.1]: https://github.com/rtic-rs/rtic/compare/v0.5.0...v0.5.1
-[v0.5.0]: https://github.com/rtic-rs/rtic/compare/v0.4.3...v0.5.0
-[v0.4.3]: https://github.com/rtic-rs/rtic/compare/v0.4.2...v0.4.3
-[v0.4.2]: https://github.com/rtic-rs/rtic/compare/v0.4.1...v0.4.2
-[v0.4.1]: https://github.com/rtic-rs/rtic/compare/v0.4.0...v0.4.1
-[v0.4.0]: https://github.com/rtic-rs/rtic/compare/v0.3.4...v0.4.0
-[v0.3.4]: https://github.com/rtic-rs/rtic/compare/v0.3.3...v0.3.4
-[v0.3.3]: https://github.com/rtic-rs/rtic/compare/v0.3.2...v0.3.3
-[v0.3.2]: https://github.com/rtic-rs/rtic/compare/v0.3.1...v0.3.2
-[v0.3.1]: https://github.com/rtic-rs/rtic/compare/v0.3.0...v0.3.1
-[v0.3.0]: https://github.com/rtic-rs/rtic/compare/v0.2.2...v0.3.0
-[v0.2.2]: https://github.com/rtic-rs/rtic/compare/v0.2.1...v0.2.2
-[v0.2.1]: https://github.com/rtic-rs/rtic/compare/v0.2.0...v0.2.1
-[v0.2.0]: https://github.com/rtic-rs/rtic/compare/v0.1.1...v0.2.0
-[v0.1.1]: https://github.com/rtic-rs/rtic/compare/v0.1.0...v0.1.1
diff --git a/rtic/Cargo.toml b/rtic/Cargo.toml
index eeac81b78ac..932684ae604 100644
--- a/rtic/Cargo.toml
+++ b/rtic/Cargo.toml
@@ -16,7 +16,7 @@ name = "rtic"
 readme = "../README.md"
 repository = "https://github.com/rtic-rs/rtic"
 
-version = "2.1.2"
+version = "2.1.3"
 
 [package.metadata.docs.rs]
 features = ["thumbv7-backend"]
@@ -32,7 +32,7 @@ riscv = { version = "0.13.0", optional = true }
 cortex-m = { version = "0.7.0", optional = true }
 bare-metal = "1.0.0"
 portable-atomic = { version = "1", default-features = false }
-rtic-macros = { path = "../rtic-macros", version = "=2.1.2" }
+rtic-macros = { path = "../rtic-macros", version = "=2.1.3" }
 rtic-core = "1"
 critical-section = "1"