diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55e5bcd..08b8838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,31 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.3.6] - 2026-04-21
+
 ### Changed
 
-- **C/C++ file pattern language detection** - When `lsp_servers[].file_patterns` include simple extensions such as `**/*.c` or `**/*.h`, mcpls now derives extension-to-language mappings from those patterns and overlays them onto the workspace extension map. This changes the default behavior for matching C/C++ files to prefer the configured LSP server language instead of falling back to built-in mappings or `plaintext`.
+- Bump rmcp from 1.1.1 to 1.5.0; remove now-redundant `tool_router` struct field (auto-generated by the `#[tool_router]` macro since 1.4.0)
+- Bump MSRV from 1.85 to 1.88 (`rmcp-macros 1.5.0` pulls `darling 0.23.0` which requires rustc 1.88)
+- Bump tokio from 1.50.0 to 1.52.0
+- Bump toml from 1.0.6 to 1.1.2
+- Bump clap from 4.5.60 to 4.6.0
+- Bump tracing-subscriber from 0.3.22 to 0.3.23
+- CI: pin all GitHub Actions to full commit SHAs for supply-chain security
+- CI: bump actions/checkout v4 → v6
+- CI: bump github/codeql-action v3 → v4
+- CI: bump codecov/codecov-action v5 → v6
+- CI: bump softprops/action-gh-release 2.6.1 → 3.0.0
+- CI: bump EmbarkStudios/cargo-deny-action 2.0.15 → 2.0.17
+- CI: bump lewagon/wait-on-check-action 1.5.0 → 1.7.0
+
+### Fixed
+
+- **C/C++ file pattern language detection** — `lsp_servers[].file_patterns` now derives extension-to-language mappings (e.g. `**/*.c` → `c`, `**/*.h` → `c`) and overlays them onto the workspace extension map, so configured language IDs take precedence over built-in defaults
+- CI: nightly rustfmt failures when the `rustfmt` component is temporarily unavailable for the latest nightly — now uses `rustup toolchain install nightly --component rustfmt --allow-downgrade`
+- CI: CodeQL workflow now runs for fork pull requests (`pull_request_target`)
+- CI: labeler workflow uses `pull_request_target` to access labels on fork PRs
 
 ## [0.3.5] - 2026-03-17
 
@@ -465,7 +487,8 @@ Add to `~/.claude/mcp.json`:
 - Workspace auto-discovery
 - LSP server auto-detection and installation
 
-[Unreleased]: https://github.com/bug-ops/mcpls/compare/v0.3.5...HEAD
+[Unreleased]: https://github.com/bug-ops/mcpls/compare/v0.3.6...HEAD
+[0.3.6]: https://github.com/bug-ops/mcpls/compare/v0.3.5...v0.3.6
 [0.3.5]: https://github.com/bug-ops/mcpls/compare/v0.3.4...v0.3.5
 [0.3.4]: https://github.com/bug-ops/mcpls/compare/v0.3.3...v0.3.4
 [0.3.3]: https://github.com/bug-ops/mcpls/compare/v0.3.2...v0.3.3
diff --git a/Cargo.lock b/Cargo.lock
index e0a2670..a772466 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -820,7 +820,7 @@ dependencies = [
 
 [[package]]
 name = "mcpls"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -835,7 +835,7 @@ dependencies = [
 
 [[package]]
 name = "mcpls-core"
-version = "0.3.5"
+version = "0.3.6"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index d3f3d26..5151f44 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.3.5"
+version = "0.3.6"
 edition = "2024"
 rust-version = "1.88"
 authors = ["Andrei G. <k05h31@gmail.com>"]
@@ -25,7 +25,7 @@ dirs = "6.0"
 futures = "0.3"
 ignore = "0.4"
 lsp-types = "0.97"
-mcpls-core = { path = "crates/mcpls-core", version = "0.3.5" }
+mcpls-core = { path = "crates/mcpls-core", version = "0.3.6" }
 predicates = "3.1"
 rmcp = "1.5.0"
 rstest = "0.26"