diff --git a/Cargo.toml b/Cargo.toml
index 2708023c7..ec2a7c00d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,13 +5,13 @@ default-members = ["crates/rmcp", "crates/rmcp-macros"]
 resolver = "3"
 
 [workspace.dependencies]
-rmcp = { version = "3.5.1", path = "./crates/rmcp" }
-rmcp-macros = { version = "3.5.1", path = "./crates/rmcp-macros" }
+rmcp = { version = "3.6.0", path = "./crates/rmcp" }
+rmcp-macros = { version = "3.6.0", path = "./crates/rmcp-macros" }
 
 [workspace.package]
 edition = "2024"
 rust-version = "1.88"
-version = "3.5.1"
+version = "3.6.0"
 authors = ["4t145 <u4t145@163.com>"]
 license = "Apache-2.0"
 repository = "https://github.com/modelcontextprotocol/rust-sdk/"
diff --git a/crates/rmcp-macros/CHANGELOG.md b/crates/rmcp-macros/CHANGELOG.md
index 776590fcb..bab6e4af2 100644
--- a/crates/rmcp-macros/CHANGELOG.md
+++ b/crates/rmcp-macros/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.6.0](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v3.5.1...rmcp-macros-v3.6.0) - 2026-10-17
+
+### Fixed
+
+- *(transport)* accept nested x-mcp-header annotations ([#1359](https://github.com/modelcontextprotocol/rust-sdk/pull/1359))
+- ship LICENSE in rmcp and rmcp-macros crates ([#1342](https://github.com/modelcontextprotocol/rust-sdk/pull/1342))
+
+### Other
+
+- combine AI issue triage with a maintainer rotation as the responsible reviewer ([#1260](https://github.com/modelcontextprotocol/rust-sdk/pull/1260))
+
 ## [3.4.1](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-macros-v3.4.0...rmcp-macros-v3.4.1) - 2026-09-23
 
 ### Fixed
diff --git a/crates/rmcp/CHANGELOG.md b/crates/rmcp/CHANGELOG.md
index 945069939..f9d827c69 100644
--- a/crates/rmcp/CHANGELOG.md
+++ b/crates/rmcp/CHANGELOG.md
@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.6.0](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-v3.5.1...rmcp-v3.6.0) - 2026-10-17
+
+### Added
+
+- *(client)* cancel an abandoned tools/call, prompts/get or resources/read ([#1344](https://github.com/modelcontextprotocol/rust-sdk/pull/1344))
+- *(auth)* add initial authorization scope selection ([#1352](https://github.com/modelcontextprotocol/rust-sdk/pull/1352))
+- *(transport)* add non-blocking stdio_pipes transport ([#1304](https://github.com/modelcontextprotocol/rust-sdk/pull/1304))
+
+### Fixed
+
+- *(streamable-http-server)* answer a session-less non-initialize POST with 400 ([#1377](https://github.com/modelcontextprotocol/rust-sdk/pull/1377))
+- *(model)* read a request id written in float form as that integer ([#1346](https://github.com/modelcontextprotocol/rust-sdk/pull/1346))
+- *(client)* answer a server ping during the initialize handshake ([#1366](https://github.com/modelcontextprotocol/rust-sdk/pull/1366))
+- *(transport)* accept nested x-mcp-header annotations ([#1359](https://github.com/modelcontextprotocol/rust-sdk/pull/1359))
+- *(streamable-http-client)* handle error responses to initialize ([#1361](https://github.com/modelcontextprotocol/rust-sdk/pull/1361))
+- *(transport)* bound the incoming line buffer in AsyncRwTransport ([#1049](https://github.com/modelcontextprotocol/rust-sdk/pull/1049))
+- *(model)* reject malformed JSON-RPC messages with conflicting result and error fields ([#1283](https://github.com/modelcontextprotocol/rust-sdk/pull/1283)) ([#1287](https://github.com/modelcontextprotocol/rust-sdk/pull/1287))
+- ship LICENSE in rmcp and rmcp-macros crates ([#1342](https://github.com/modelcontextprotocol/rust-sdk/pull/1342))
+- *(streamable-http-server)* release the session map lock before waiting on a session ([#1323](https://github.com/modelcontextprotocol/rust-sdk/pull/1323))
+- *(rmcp)* gate client- and server-only helpers behind their features ([#1329](https://github.com/modelcontextprotocol/rust-sdk/pull/1329))
+- cancel pending request tokens after transport EOF ([#1333](https://github.com/modelcontextprotocol/rust-sdk/pull/1333))
+- *(rmcp)* import base64-only prompt content types under the feature ([#1314](https://github.com/modelcontextprotocol/rust-sdk/pull/1314))
+
+### Other
+
+- combine AI issue triage with a maintainer rotation as the responsible reviewer ([#1260](https://github.com/modelcontextprotocol/rust-sdk/pull/1260))
+
 ## [3.5.1](https://github.com/modelcontextprotocol/rust-sdk/compare/rmcp-v3.5.0...rmcp-v3.5.1) - 2026-10-05
 
 ### Fixed