diff --git a/CHANGELOG b/CHANGELOG
index d998d1c..c0134d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2038,3 +2038,13 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * simplify channel send() in WalkDir() by @T-M-A in #18186
 * Fix current_send_in_progress metric always being zero by @mctoohey in #18160
 * avoid rebalance state for getObjectTags if any by @harshavardhana in #18197
+
+[3.9.4]
+* Update minio to 2023-10-24T04-42-36Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2023-10-24T04-42-36Z)
+* choose different max_concurrent requests per drive based on HDD/NVMe by @harshavardhana in #18254
+* Don't skip rules with ExpiredObjectDeleteMarker by @krisis in #18256
+* Fix globalDeploymentID race by @klauspost in #18275
+* Remove unused config migration by @klauspost in #18277
+* Fix linter errors in Windows specific code by @klauspost in #18276
+* cache DiskInfo() metrics call separately by @harshavardhana in #18270
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 91003b6..4ea1bb9 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "3.9.3",
-  "upstreamVersion": "2023-10-16T04-13-43Z",
+  "version": "3.9.4",
+  "upstreamVersion": "2023-10-24T04-42-36Z",
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,