diff --git a/.changeset/full-pets-punch.md b/.changeset/full-pets-punch.md
deleted file mode 100644
index a6bd204ab5..0000000000
--- a/.changeset/full-pets-punch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": minor
----
-
-v3.25.21
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f4cccac46..91605ef7e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Roo Code Changelog
 
+## [3.25.21] - 2025-08-21
+
+- Ensure subtask results are provided to GPT-5 in OpenAI Responses API
+- Promote the experimental AssistantMessageParser to the default parser
+- Update DeepSeek models context window to 128k (thanks @JuanPerezReal)
+- Enable grounding features for Vertex AI (thanks @anguslees)
+- Allow orchestrator to pass TODO lists to subtasks
+- Improved MDM handling
+- Handle nullish token values in ContextCondenseRow to prevent UI crash (thanks @s97712)
+- Improved context window error handling for OpenAI and other providers
+- Add "installed" filter to Roo Marketplace (thanks @semidark)
+- Improve filesystem access checks (thanks @elianiva)
+- Support for loading Roo modes from multiple YAML files in the `.roo/roo_modes` directory (thanks @farazoman)
+- Add Featherless provider (thanks @DarinVerheijke)
+
 ## [3.25.20] - 2025-08-19
 
 - Add announcement for Sonic model
diff --git a/src/package.json b/src/package.json
index b79d1dc8f1..0600711e4d 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.25.20",
+	"version": "3.25.21",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",