diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
index 5e84c27635..afb454293c 100644
--- a/ports/7zip/CMakeLists.txt
+++ b/ports/7zip/CMakeLists.txt
@@ -125,6 +125,10 @@ target_sources(7zip PRIVATE
     C/XzCrc64.c
     C/Xxh64.c
     C/ZstdDec.c
+    C/Md5.c
+    C/Sha3.c
+    C/Sha512.c
+    C/Sha512Opt.c
 
     CPP/Common/CRC.cpp
     CPP/Common/CrcReg.cpp
@@ -148,6 +152,10 @@ target_sources(7zip PRIVATE
     CPP/Common/XzCrc64Init.cpp
     CPP/Common/XzCrc64Reg.cpp
     CPP/Common/Xxh64Reg.cpp
+    CPP/Common/Md5Reg.cpp
+    CPP/Common/Sha3Reg.cpp
+    CPP/Common/Sha512Prepare.cpp
+    CPP/Common/Sha512Reg.cpp
 
     CPP/7zip/Common/CreateCoder.cpp
     CPP/7zip/Common/CWrappers.cpp
diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
index abd7e77e25..fc9776c9ac 100644
--- a/ports/7zip/portfile.cmake
+++ b/ports/7zip/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ip7z/7zip
     REF "${VERSION}"
-    SHA512 5aa2a32a1d2ea81b0ee487e07efc444fda69967a67fb3a7d6e8fd06d32ebf9be76948ea23d258feade89877be698d09e1ef2ba79bbeda83752fdbb50a007af6c
+    SHA512 dc0241ed96907965445550912d1171fe32230a52997b089558a4cc73a662fc6a17940db8dcb0794b805268964899d9e5a48ddb444e92b56fd243bbaa17c20a1c
     HEAD_REF main
 )
 
diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
index 6d12dea02d..06b0d3b8e8 100644
--- a/ports/7zip/vcpkg.json
+++ b/ports/7zip/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "7zip",
-  "version-string": "24.08",
-  "port-version": 1,
+  "version-string": "24.09",
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",
diff --git a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
index 6a4dd6fc2a..630699a2bc 100644
--- a/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program(7Z).cmake
@@ -2,7 +2,7 @@ set(program_name 7z)
 if(CMAKE_HOST_WIN32)
     set(paths_to_search "${DOWNLOADS}/tools/7zip_msi-${tool_subdirectory}-windows/Files/7-Zip") # vcpkg fetch 7zip_msi path
     list(APPEND paths_to_search "${DOWNLOADS}/tools/7z/${tool_subdirectory}/Files/7-Zip")
-    set(download_urls "https://github.com/ip7z/7zip/releases/download/24.08/7z2408.msi" "https://7-zip.org/a/7z2408.msi")
-    set(download_filename "7z2408.msi")
-    set(download_sha512 0bc88c99ad921a6f828d9ed9b8391510d1d0c2f8ecb7ad2921838c97c20f215e2ab03198009d159e2d1859bb20f157010f492288ce61c86544df06742cebbc34)
+    set(download_urls "https://github.com/ip7z/7zip/releases/download/24.09/7z2409.msi" "https://7-zip.org/a/7z2409.msi")
+    set(download_filename "7z2409.msi")
+    set(download_sha512 33448CC4EDB2550F1FE6C4BAC27C6F8D3E0D1985F7C6ABCF34AC83DFF650FB90B926F65A4553DA4E92868F507DE4DFAD87E5A38B3ED8C68668B983105BB39224)
 endif()
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 5aa3cd84e9..cd9bada05c 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -131,24 +131,24 @@
         <archiveName>installer-framework-opensource-src-4.4.0.zip</archiveName>
     </tool>
     <tool name="7zip_msi" os="windows">
-        <version>24.08</version>
+        <version>24.09</version>
         <exeRelativePath>Files\7-Zip\7z.exe</exeRelativePath>
-        <url>https://github.com/ip7z/7zip/releases/download/24.08/7z2408-x64.msi</url>
-        <sha512>3259bf5e251382333c9d18a3fc01d83491fb41bc4ac4ddb25a02918494594c1074482b6608189a8a89e343d78e34d57420cdeff1d7ace5acfdcaacc8776f1be8</sha512>
-        <archiveName>7z2408-x64.msi</archiveName>
+        <url>https://github.com/ip7z/7zip/releases/download/24.09/7z2409-x64.msi</url>
+        <sha512>A3396A70B739F3A80B25FE64103D1E98EA584DCDBDBA740884EA10E00EDFB37966CEB85F5CCA995865FE90371EADFF9DF8132124D3DC2598A2D78BF86F6DDD6E</sha512>
+        <archiveName>7z2409-x64.msi</archiveName>
     </tool>
     <tool name="7zip" os="windows">
-        <version>24.08</version>
+        <version>24.09</version>
         <exeRelativePath>7za.exe</exeRelativePath>
-        <url>https://github.com/ip7z/7zip/releases/download/24.08/7z2408-extra.7z</url>
-        <sha512>35f55236fccfb576ca014e29d0c35f4a213e53f06683bd2e82f869ed02506e230c8dd623c01d0207244d6a997031f737903456b7ad4a44db1717f0a17a78602e</sha512>
-        <archiveName>7z2408-extra.7z</archiveName>
+        <url>https://github.com/ip7z/7zip/releases/download/24.09/7z2409-extra.7z</url>
+        <sha512>d17ef51ebe5e61761fa449c0d6106950e7e8dd9ef9bb9f129aed048f3d8d81662ba82a71e8264fff7c0f6764f410f2e8a4430d27e4ce915cf339e8d639905b3b</sha512>
+        <archiveName>7z2409-extra.7z</archiveName>
      </tool>
     <tool name="7zr" os="windows">
-        <version>24.08</version>
+        <version>24.09</version>
         <exeRelativePath>7zr.exe</exeRelativePath>
-        <url>https://github.com/ip7z/7zip/releases/download/24.08/7zr.exe</url>
-        <sha512>424196f2acf5b89807f4038683acc50e7604223fc630245af6bab0e0df923f8b1c49cb09ac709086568c214c3f53dcb7d6c32e8a54af222a3ff78cfab9c51670</sha512>
+        <url>https://github.com/ip7z/7zip/releases/download/24.09/7zr.exe</url>
+        <sha512>44D8504A693AD4D6B79631B653FC19B572DE6BBE38713B53C45D9C9D5D3710AA8DF93EE867A2A24419EBE883B8255FD18F30F8CF374B2242145FD6ACB2189659</sha512>
     </tool>
     <tool name="aria2" os="windows">
         <version>1.37.0</version>
diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
index 55314b96b9..fb74f0fefd 100644
--- a/versions/7-/7zip.json
+++ b/versions/7-/7zip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "29a42acc927078e1dc58fbbf354d1c59e01d0a03",
+      "version-string": "24.09",
+      "port-version": 0
+    },
     {
       "git-tree": "36bee800b8aadc1908cc02cc1561dee40a3b43f6",
       "version-string": "24.08",
diff --git a/versions/baseline.json b/versions/baseline.json
index 3bf25305a4..40e7e4d7da 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5,8 +5,8 @@
       "port-version": 4
     },
     "7zip": {
-      "baseline": "24.08",
-      "port-version": 1
+      "baseline": "24.09",
+      "port-version": 0
     },
     "ableton": {
       "baseline": "3.0.6",