diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46b334b..810a2c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to the "vscode-java-debugger" extension will be documented i
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.58.2 - 2025-04-28
+### Fixed
+- Provide graceful shutdown on debug stop action. [#1274](https://github.com/microsoft/vscode-java-debug/issues/1274). Thanks to [Dave Syer](https://github.com/dsyer) for contribution.
+
+### Changed
+- Update Apache Commons IO from 2.11.0 to 2.19.0. [java-debug#585](https://github.com/microsoft/java-debug/pull/585). Thanks to [Roland Grunberg](https://github.com/rgrunber) for contribution.
+
 ## 0.58.1 - 2024-10-31
 ### Added
 - The launch config `envFile` now supports an array of env files. [#1505](https://github.com/microsoft/vscode-java-debug/issues/1505). Thanks to [Ed Hillmann](https://github.com/hildo) for contribution.
diff --git a/package-lock.json b/package-lock.json
index 8e72db3..290a7de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "vscode-java-debug",
-  "version": "0.58.1",
+  "version": "0.58.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vscode-java-debug",
-      "version": "0.58.1",
+      "version": "0.58.2",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "compare-versions": "^4.1.4",
diff --git a/package.json b/package.json
index e08a667..d5b5886 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-java-debug",
   "displayName": "Debugger for Java",
   "description": "A lightweight Java debugger for Visual Studio Code",
-  "version": "0.58.1",
+  "version": "0.58.2",
   "publisher": "vscjava",
   "preview": false,
   "aiKey": "67d4461e-ccba-418e-8082-1bd0acfe8516",
@@ -52,7 +52,7 @@
       }
     ],
     "javaExtensions": [
-      "./server/com.microsoft.java.debug.plugin-0.53.1.jar"
+      "./server/com.microsoft.java.debug.plugin-0.53.2.jar"
     ],
     "commands": [
       {