diff --git a/Cargo.toml b/Cargo.toml
index bd816a24..ef0c8e14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,12 +3,12 @@ members = ["crates/rmcp", "crates/rmcp-macros", "examples/*"]
 resolver = "2"
 
 [workspace.dependencies]
-rmcp = { version = "0.8.3", path = "./crates/rmcp" }
-rmcp-macros = { version = "0.8.3", path = "./crates/rmcp-macros" }
+rmcp = { version = "0.8.4", path = "./crates/rmcp" }
+rmcp-macros = { version = "0.8.4", path = "./crates/rmcp-macros" }
 
 [workspace.package]
 edition = "2024"
-version = "0.8.3"
+version = "0.8.4"
 authors = ["4t145 <u4t145@163.com>"]
 license = "MIT"
 repository = "https://github.com/modelcontextprotocol/rust-sdk/"
diff --git a/crates/rmcp-macros/CHANGELOG.md b/crates/rmcp-macros/CHANGELOG.md
index 6ad900a2..4b3e49fc 100644
--- a/crates/rmcp-macros/CHANGELOG.md
+++ b/crates/rmcp-macros/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.4](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v0.8.3...rmcp-macros-v0.8.4) - 2025-11-04
+
+### Fixed
+
+- *(doc)* add stakpak-agent to Built with rmcp section ([#500](https://github.com/modelcontextprotocol/rust-sdk/pull/500))
+
 ## [0.8.2](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v0.8.1...rmcp-macros-v0.8.2) - 2025-10-21
 
 ### Other
diff --git a/crates/rmcp/CHANGELOG.md b/crates/rmcp/CHANGELOG.md
index b78a2d54..1c93ac06 100644
--- a/crates/rmcp/CHANGELOG.md
+++ b/crates/rmcp/CHANGELOG.md
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.4](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-v0.8.3...rmcp-v0.8.4) - 2025-11-04
+
+### Fixed
+
+- *(oauth)* fix oauth credential refresh ([#509](https://github.com/modelcontextprotocol/rust-sdk/pull/509))
+- do not manually construct fallback authorization metadata ([#507](https://github.com/modelcontextprotocol/rust-sdk/pull/507))
+- *(doc)* add stakpak-agent to Built with rmcp section ([#500](https://github.com/modelcontextprotocol/rust-sdk/pull/500))
+
 ## [0.8.3](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-v0.8.2...rmcp-v0.8.3) - 2025-10-22
 
 ### Fixed