diff --git a/.changeset/slimy-years-smell.md b/.changeset/slimy-years-smell.md
deleted file mode 100644
index 943c31593a..0000000000
--- a/.changeset/slimy-years-smell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-new feature allowing users to toggle whether an individual MCP (Model Context Protocol) tool is included in the context provided to the AI model
diff --git a/.changeset/v3.21.2.md b/.changeset/v3.21.2.md
deleted file mode 100644
index 612c7f7bcd..0000000000
--- a/.changeset/v3.21.2.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-"roo-cline": patch
----
-
-- Add LaTeX math equation rendering in chat window
-- Add toggle for disable MCP server tool from prompt (thanks @Rexarrior!)
-- Add symlink support to list_files tool
-- Fix marketplace blanking after populating
-- Fix recursive directory scanning in @ mention "Add Folder" functionality (thanks @village-way!)
-- Resolve phantom subtask display on cancel during API retry
-- Correct Gemini 2.5 Flash pricing (thanks @daniel-lxs!)
-- Resolve marketplace timeout issues and display installed MCPs (thanks @daniel-lxs!)
-- Onboarding tweaks to emphasize modes (thanks @brunobergher!)
-- Rename 'Boomerang Tasks' to 'Task Orchestration' for clarity
-- Remove command execution from attempt_completion
-- Fix markdown for links followed by punctuation (thanks @xyOz-dev!)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0083c06840..9bc7bc1276 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Roo Code Changelog
 
+## [3.21.2] - 2025-06-20
+
+- Add LaTeX math equation rendering in chat window
+- Add toggle for excluding MCP server tools from the prompt (thanks @Rexarrior!)
+- Add symlink support to list_files tool
+- Fix marketplace blanking after populating
+- Fix recursive directory scanning in @ mention "Add Folder" functionality (thanks @village-way!)
+- Resolve phantom subtask display on cancel during API retry
+- Correct Gemini 2.5 Flash pricing (thanks @daniel-lxs!)
+- Resolve marketplace timeout issues and display installed MCPs (thanks @daniel-lxs!)
+- Onboarding tweaks to emphasize modes (thanks @brunobergher!)
+- Rename 'Boomerang Tasks' to 'Task Orchestration' for clarity
+- Remove command execution from attempt_completion
+- Fix markdown for links followed by punctuation (thanks @xyOz-dev!)
+
 ## [3.21.1] - 2025-06-19
 
 - Fix tree-sitter issues that were preventing codebase indexing from working correctly
diff --git a/src/package.json b/src/package.json
index 4c2df62ddd..78fa43d331 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.21.1",
+	"version": "3.21.2",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",