diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22220c169e..0083c06840 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
 # Roo Code Changelog
 
-## 3.21.1
+## [3.21.1] - 2025-06-19
 
-### Patch Changes
-
--   - Fix: improve error handling for codebase search embeddings (thanks @hannesrudolph!)
+- Fix tree-sitter issues that were preventing codebase indexing from working correctly
+- Improve error handling for codebase search embeddings
+- Resolve MCP server execution on Windows with node version managers
+- Default 'Enable MCP Server Creation' to false
+- Rate limit correctly when starting a subtask (thanks @olweraltuve!)
 
 ## [3.21.0] - 2025-06-17