diff --git a/.changeset/salty-geese-relate.md b/.changeset/salty-geese-relate.md
deleted file mode 100644
index 5a55e5eb49..0000000000
--- a/.changeset/salty-geese-relate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix vscode-material-icons path
diff --git a/.changeset/sweet-turtles-wink.md b/.changeset/sweet-turtles-wink.md
deleted file mode 100644
index d02d7ee504..0000000000
--- a/.changeset/sweet-turtles-wink.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix OpenRouter names
diff --git a/.changeset/young-buckets-fold.md b/.changeset/young-buckets-fold.md
deleted file mode 100644
index a796dedc79..0000000000
--- a/.changeset/young-buckets-fold.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"roo-cline": patch
----
-
-Fix global settings export
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb7ee64a25..033fefff6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Roo Code Changelog
 
+## [3.18.2] - 2025-05-23
+
+- Fix vscode-material-icons in the filer picker
+- Fix global settings export
+- Respect user-configured terminal integration timeout (thanks @KJ7LNW)
+- Contex condensing enhancements (thanks @SannidhyaSah)
+
 ## [3.18.1] - 2025-05-22
 
 - Add support for Claude Sonnet 4 and Claude Opus 4 models with thinking variants in Anthropic, Bedrock, and Vertex (thanks @shariqriazz!)
diff --git a/src/package.json b/src/package.json
index 536d24af31..ccf932890b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "RooVeterinaryInc",
-	"version": "3.18.1",
+	"version": "3.18.2",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",