diff --git a/Cargo.lock b/Cargo.lock
index 77854a4..1f04858 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2001,9 +2001,9 @@ dependencies = [
 
 [[package]]
 name = "rmcp"
-version = "1.8.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1f571c72940a19d9532fe52dbea8bc9912bf1d766c2970bb824056b86f3f59"
+checksum = "f00a32c3b81b7b254076a65abd5ab2551209146713ba38f73818657e865e9433"
 dependencies = [
  "async-trait",
  "base64",
@@ -2023,9 +2023,9 @@ dependencies = [
 
 [[package]]
 name = "rmcp-macros"
-version = "1.8.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aad0035b69380782d78ea95b508327e6deaa2235909053e596eea8f27b5e1d5"
+checksum = "783d787bf21813b285f13019adc49e11af501c658890c1e519f31f937c68b7e3"
 dependencies = [
  "darling",
  "proc-macro2",
diff --git a/crates/weave-mcp/Cargo.toml b/crates/weave-mcp/Cargo.toml
index 58256ae..368a2c6 100644
--- a/crates/weave-mcp/Cargo.toml
+++ b/crates/weave-mcp/Cargo.toml
@@ -19,7 +19,7 @@ weave-core = { path = "../weave-core", version = "0.3.6" }
 weave-crdt = { path = "../weave-crdt", version = "0.3.6" }
 sem-core = "0.21.0"
 lru = "0.18"
-rmcp = { version = "1.7", features = ["server", "transport-io"] }
+rmcp = { version = "2.1", features = ["server", "transport-io"] }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"