diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json
index dd11121ff2a836..2463defed9bc87 100644
--- a/ports/boost-asio/vcpkg.json
+++ b/ports/boost-asio/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-asio",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost asio module",
   "homepage": "https://www.boost.org/libs/asio",
   "license": "BSL-1.0",
@@ -27,11 +28,6 @@
       "platform": "!uwp & !emscripten",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-coroutine",
-      "platform": "!(arm & windows) & !uwp & !emscripten",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-date-time",
       "version>=": "1.87.0"
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake
index 808778871e5b4f..3f1ca8462fe911 100644
--- a/ports/boost-atomic/portfile.cmake
+++ b/ports/boost-atomic/portfile.cmake
@@ -8,7 +8,6 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fix-include.patch
-        
 )
 
 set(FEATURE_OPTIONS "")
diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json
index d9d5cc9ec34127..5ee0d5f823daa0 100644
--- a/ports/boost-atomic/vcpkg.json
+++ b/ports/boost-atomic/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-atomic",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost atomic module",
   "homepage": "https://www.boost.org/libs/atomic",
   "license": "BSL-1.0",
diff --git a/ports/boost-cobalt/portfile.cmake b/ports/boost-cobalt/portfile.cmake
index 5ca2d15d727035..206c1c3649c2e8 100644
--- a/ports/boost-cobalt/portfile.cmake
+++ b/ports/boost-cobalt/portfile.cmake
@@ -1,4 +1,4 @@
-# Automatically generated by scripts/boost/generate-ports.ps1
+# Automatically generated by scripts/boost/generate-ports.ps1
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -8,7 +8,6 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         fail-on-compiler-not-supported.patch
-        
 )
 
 set(FEATURE_OPTIONS "")
diff --git a/ports/boost-cobalt/vcpkg.json b/ports/boost-cobalt/vcpkg.json
index 9bed03ea354b5c..fc653728b87f05 100644
--- a/ports/boost-cobalt/vcpkg.json
+++ b/ports/boost-cobalt/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-cobalt",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost cobalt module",
   "homepage": "https://www.boost.org/libs/cobalt",
   "license": "BSL-1.0",
diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json
index 3fcb4a480c1601..bdca148567b192 100644
--- a/ports/boost-compute/vcpkg.json
+++ b/ports/boost-compute/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-compute",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost compute module",
   "homepage": "https://www.boost.org/libs/compute",
   "license": "BSL-1.0",
@@ -18,6 +19,10 @@
       "name": "boost-assert",
       "version>=": "1.87.0"
     },
+    {
+      "name": "boost-atomic",
+      "version>=": "1.87.0"
+    },
     {
       "name": "boost-chrono",
       "version>=": "1.87.0"
diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake
index ed341d7996d452..79563164b1a042 100644
--- a/ports/boost-context/portfile.cmake
+++ b/ports/boost-context/portfile.cmake
@@ -8,7 +8,6 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         marmasm.patch
-        
 )
 
 set(FEATURE_OPTIONS "")
diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json
index cfa4e0a8621917..18a27cc6d51f90 100644
--- a/ports/boost-context/vcpkg.json
+++ b/ports/boost-context/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-context",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost context module",
   "homepage": "https://www.boost.org/libs/context",
   "license": "BSL-1.0",
diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json
index 44d7d27d89cf4c..3853ad3d83f3b8 100644
--- a/ports/boost-flyweight/vcpkg.json
+++ b/ports/boost-flyweight/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-flyweight",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost flyweight module",
   "homepage": "https://www.boost.org/libs/flyweight",
   "license": "BSL-1.0",
@@ -65,6 +66,10 @@
     {
       "name": "boost-type-traits",
       "version>=": "1.87.0"
+    },
+    {
+      "name": "boost-unordered",
+      "version>=": "1.87.0"
     }
   ]
 }
diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake
index e8f9a05d43e5c9..aeca9c2e5c3811 100644
--- a/ports/boost-interprocess/portfile.cmake
+++ b/ports/boost-interprocess/portfile.cmake
@@ -1,10 +1,10 @@
 # Automatically generated by scripts/boost/generate-ports.ps1
+
 vcpkg_download_distfile(ARM32_PATCH
     URLS https://github.com/boostorg/interprocess/commit/f58e968f13e693ffaa78fb283972e8598dc48c9f.patch?full_index=1
-    FILENAME arm32.patch
+    FILENAME boost-interprocess-arm32-f58e968f13e693ffaa78fb283972e8598dc48c9f.patch
     SHA512 7e9b5ebac8ef3c04327c29bad9b8b6259320fd9ebec80bac905b7bd4f68e5cb4f001e2c80f83a875cc12376df4f3b444b34251ac3ea88962982a147432ef0f7c
 )
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/interprocess
diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json
index ff0104a6489d5e..3c2e8f09ec2521 100644
--- a/ports/boost-interprocess/vcpkg.json
+++ b/ports/boost-interprocess/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-interprocess",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost interprocess module",
   "homepage": "https://www.boost.org/libs/interprocess",
   "license": "BSL-1.0",
@@ -22,10 +23,6 @@
       "name": "boost-container",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-core",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-headers",
       "version>=": "1.87.0"
@@ -38,14 +35,6 @@
       "name": "boost-move",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.87.0"
-    },
-    {
-      "name": "boost-type-traits",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-winapi",
       "version>=": "1.87.0"
diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake
index d73612c8e1815c..33a5a41d500191 100644
--- a/ports/boost-json/portfile.cmake
+++ b/ports/boost-json/portfile.cmake
@@ -1,10 +1,10 @@
 # Automatically generated by scripts/boost/generate-ports.ps1
+
 vcpkg_download_distfile(ARM32_PATCH
     URLS https://github.com/boostorg/json/commit/57d42f07158b8ea4a713378c90d22b28ca4787f8.patch?full_index=1
-    FILENAME arm32.patch
+    FILENAME boost-json-arm32-57d42f07158b8ea4a713378c90d22b28ca4787f8.patch
     SHA512 d74a43dfc08fb34ba270a4d7de00a4307728567fbb2949f40f649c0e1c63b690d48aacfbc888e4b8075ff55262048700ab6ef669aa4277d6e9bebbbbd5e9473f
 )
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/json
diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json
index b10263c37a60c6..ecf8dab6f832cd 100644
--- a/ports/boost-json/vcpkg.json
+++ b/ports/boost-json/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-json",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost json module",
   "homepage": "https://www.boost.org/libs/json",
   "license": "BSL-1.0",
diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json
index aff6ddf7882ff7..4a8a6edbc62ba1 100644
--- a/ports/boost-lexical-cast/vcpkg.json
+++ b/ports/boost-lexical-cast/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-lexical-cast",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost lexical_cast module",
   "homepage": "https://www.boost.org/libs/lexical_cast",
   "license": "BSL-1.0",
@@ -26,10 +27,6 @@
       "name": "boost-headers",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-integer",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-throw-exception",
       "version>=": "1.87.0"
diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json
index 366a6d962086d1..ce4123c052f3d0 100644
--- a/ports/boost-lockfree/vcpkg.json
+++ b/ports/boost-lockfree/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-lockfree",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost lockfree module",
   "homepage": "https://www.boost.org/libs/lockfree",
   "license": "BSL-1.0",
@@ -10,10 +11,6 @@
       "name": "boost-align",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-array",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-assert",
       "version>=": "1.87.0"
@@ -38,18 +35,6 @@
       "name": "boost-headers",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-integer",
-      "version>=": "1.87.0"
-    },
-    {
-      "name": "boost-iterator",
-      "version>=": "1.87.0"
-    },
-    {
-      "name": "boost-mpl",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-parameter",
       "version>=": "1.87.0"
@@ -63,16 +48,12 @@
       "version>=": "1.87.0"
     },
     {
-      "name": "boost-tuple",
+      "name": "boost-throw-exception",
       "version>=": "1.87.0"
     },
     {
       "name": "boost-type-traits",
       "version>=": "1.87.0"
-    },
-    {
-      "name": "boost-utility",
-      "version>=": "1.87.0"
     }
   ]
 }
diff --git a/ports/boost-mysql/vcpkg.json b/ports/boost-mysql/vcpkg.json
index 37067772ed4b9a..430c8ad59cb94f 100644
--- a/ports/boost-mysql/vcpkg.json
+++ b/ports/boost-mysql/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-mysql",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost mysql module",
   "homepage": "https://www.boost.org/libs/mysql",
   "license": "BSL-1.0",
@@ -22,6 +23,10 @@
       "name": "boost-cmake",
       "version>=": "1.87.0"
     },
+    {
+      "name": "boost-compat",
+      "version>=": "1.87.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.87.0"
diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json
index 9709c2eba65d21..023e68224e7ce2 100644
--- a/ports/boost-optional/vcpkg.json
+++ b/ports/boost-optional/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-optional",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost optional module",
   "homepage": "https://www.boost.org/libs/optional",
   "license": "BSL-1.0",
@@ -22,26 +23,10 @@
       "name": "boost-core",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-detail",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-headers",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-move",
-      "version>=": "1.87.0"
-    },
-    {
-      "name": "boost-predef",
-      "version>=": "1.87.0"
-    },
-    {
-      "name": "boost-static-assert",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-throw-exception",
       "version>=": "1.87.0"
@@ -49,10 +34,6 @@
     {
       "name": "boost-type-traits",
       "version>=": "1.87.0"
-    },
-    {
-      "name": "boost-utility",
-      "version>=": "1.87.0"
     }
   ]
 }
diff --git a/ports/boost-parser/vcpkg.json b/ports/boost-parser/vcpkg.json
index 962ac57ab010fd..4cf14a946b9d49 100644
--- a/ports/boost-parser/vcpkg.json
+++ b/ports/boost-parser/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-parser",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost parser module",
   "homepage": "https://www.boost.org/libs/parser",
   "license": "BSL-1.0",
@@ -10,6 +11,10 @@
       "name": "boost-assert",
       "version>=": "1.87.0"
     },
+    {
+      "name": "boost-charconv",
+      "version>=": "1.87.0"
+    },
     {
       "name": "boost-cmake",
       "version>=": "1.87.0"
diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake
index d13a2977f0ea39..4fb51dbe87b51d 100644
--- a/ports/boost-process/portfile.cmake
+++ b/ports/boost-process/portfile.cmake
@@ -8,7 +8,6 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         opt-filesystem.patch
-        
 )
 
 set(FEATURE_OPTIONS "")
diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json
index 060f980398ab30..8c4e9dbcc1b1c0 100644
--- a/ports/boost-process/vcpkg.json
+++ b/ports/boost-process/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-process",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost process module",
   "homepage": "https://www.boost.org/libs/process",
   "license": "BSL-1.0",
diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json
index 258ad57cad7fac..b15c308e13545e 100644
--- a/ports/boost-regex/vcpkg.json
+++ b/ports/boost-regex/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-regex",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost regex module",
   "homepage": "https://www.boost.org/libs/regex",
   "license": "BSL-1.0",
@@ -14,21 +15,53 @@
       "name": "boost-cmake",
       "version>=": "1.87.0"
     },
+    {
+      "name": "boost-concept-check",
+      "version>=": "1.87.0"
+    },
     {
       "name": "boost-config",
       "version>=": "1.87.0"
     },
+    {
+      "name": "boost-container-hash",
+      "version>=": "1.87.0"
+    },
+    {
+      "name": "boost-core",
+      "version>=": "1.87.0"
+    },
     {
       "name": "boost-headers",
       "version>=": "1.87.0"
     },
+    {
+      "name": "boost-integer",
+      "version>=": "1.87.0"
+    },
+    {
+      "name": "boost-mpl",
+      "version>=": "1.87.0"
+    },
     {
       "name": "boost-predef",
       "version>=": "1.87.0"
     },
+    {
+      "name": "boost-smart-ptr",
+      "version>=": "1.87.0"
+    },
+    {
+      "name": "boost-static-assert",
+      "version>=": "1.87.0"
+    },
     {
       "name": "boost-throw-exception",
       "version>=": "1.87.0"
+    },
+    {
+      "name": "boost-type-traits",
+      "version>=": "1.87.0"
     }
   ],
   "features": {
diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake
index bb7815883c4f08..390460ee071bc0 100644
--- a/ports/boost-unordered/portfile.cmake
+++ b/ports/boost-unordered/portfile.cmake
@@ -1,10 +1,10 @@
 # Automatically generated by scripts/boost/generate-ports.ps1
+
 vcpkg_download_distfile(ARM32_PATCH
     URLS https://github.com/boostorg/unordered/commit/07f6463c1c302c5b1d28aa253e0b768e71c90235.patch?full_index=1
-    FILENAME arm32.patch
+    FILENAME boost-unordered-arm32-07f6463c1c302c5b1d28aa253e0b768e71c90235.patch
     SHA512 99f631e57b0c7d8d08f32d994c34dbca2588b409c10ad35500c36dc5374dba91888ee5ba3ca7ed24fa75539e9d44ffc123892d859a736f63ca0ae5fffee2c178
 )
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/unordered
diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json
index 3759f380d0c07a..761799f9ff5b74 100644
--- a/ports/boost-unordered/vcpkg.json
+++ b/ports/boost-unordered/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost-unordered",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Boost unordered module",
   "homepage": "https://www.boost.org/libs/unordered",
   "license": "BSL-1.0",
diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json
index 5ea8f44c14c6db..90a322b17104da 100644
--- a/ports/boost/vcpkg.json
+++ b/ports/boost/vcpkg.json
@@ -2,6 +2,7 @@
   "$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
   "name": "boost",
   "version": "1.87.0",
+  "port-version": 1,
   "description": "Peer-reviewed portable C++ source libraries",
   "homepage": "https://boost.org",
   "license": "BSL-1.0",
@@ -71,19 +72,10 @@
       "name": "boost-circular-buffer",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-cobalt",
-      "platform": "!uwp",
-      "version>=": "1.87.0"
-    },
     {
       "name": "boost-compat",
       "version>=": "1.87.0"
     },
-    {
-      "name": "boost-compatibility",
-      "version>=": "1.86.0"
-    },
     {
       "name": "boost-compute",
       "version>=": "1.87.0"
@@ -637,7 +629,7 @@
         {
           "name": "boost-cobalt",
           "platform": "!osx & !ios & !android & !uwp",
-          "version>=": "1.86.0"
+          "version>=": "1.87.0"
         }
       ]
     },
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index b471870396a77b..6531cb6b927ad0 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -13,12 +13,12 @@ param (
 
 $ErrorActionPreference = 'Stop'
 
-$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
+$scriptsBoostDir = split-path -parent $MyInvocation.MyCommand.Definition
 if ($null -eq $portsDir) {
-    $portsDir = "$scriptsDir/../../ports"
+    $portsDir = "$scriptsBoostDir/../../ports"
 }
 if ($null -eq $vcpkg) {
-    $vcpkg = "$scriptsDir/../../vcpkg"
+    $vcpkg = "$scriptsBoostDir/../../vcpkg"
 }
 
 
@@ -28,6 +28,23 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
 # Clear this array when moving to a new boost version
 $defaultPortVersion = 0
 $portVersions = @{
+    'boost' = 1;
+    'boost-asio' = 1;
+    'boost-atomic' = 1;
+    'boost-cobalt' = 1;
+    'boost-compute' = 1;
+    'boost-context' = 1;
+    'boost-flyweight' = 1;
+    'boost-interprocess' = 1;
+    'boost-json' = 1;
+    'boost-lexical-cast' = 1;
+    'boost-lockfree' = 1;
+    'boost-mysql' = 1;
+    'boost-optional' = 1;
+    'boost-parser' = 1;
+    'boost-process' = 1;
+    'boost-regex' = 1;
+    'boost-unordered' = 1;
 }
 
 function Get-PortVersion {
@@ -65,7 +82,7 @@ $portData = @{
         }
     };
     "boost-beast"            = @{ "supports" = "!emscripten" };
-    "boost-cobalt"           = @{ "supports" = "!osx & !ios & !android & !uwp" };
+    "boost-cobalt"           = @{ "supports" = "!uwp" };
     "boost-context"          = @{ "supports" = "!uwp & !emscripten" };
     "boost-coroutine"        = @{ "supports" = "!(arm & windows) & !uwp & !emscripten" };
     "boost-fiber"            = @{
@@ -78,6 +95,7 @@ $portData = @{
     };
     "boost-filesystem"       = @{ "supports" = "!uwp" };
     "boost-function"         = @{ "dependencies" = @("boost-type-traits"); };
+    "boost-geometry"         = @{ "dependencies" = @("boost-crc", "boost-program-options"); };
     "boost-graph-parallel"   = @{ "dependencies" = @("mpi"); };
     "boost-iostreams"        = @{
         "default-features" = @("bzip2", "lzma", "zlib", "zstd");
@@ -130,7 +148,7 @@ $portData = @{
             }
         }
     };
-    "boost-mysql"           = @{ "dependencies" = @("openssl"); };
+    "boost-mysql"            = @{ "dependencies" = @("openssl"); };
     "boost-odeint"           = @{
         "features" = @{
             "mpi" = @{
@@ -360,30 +378,29 @@ function GeneratePort() {
         ""
     )
 
-    if ($Library -eq "system") {
-        $portfileLines += @(
-            "vcpkg_buildpath_length_warning(37)"
-            ""
-        )
+    if (Test-Path "$scriptsBoostDir/pre-source-stubs/$Library.cmake") {
+        $portfileLines += @(Get-Content "$scriptsBoostDir/pre-source-stubs/$Library.cmake")
     }
 
     $portfileLines += @(
-        "vcpkg_from_github("
-        "    OUT_SOURCE_PATH SOURCE_PATH"
-        "    REPO boostorg/$Library"
-        "    REF boost-`${VERSION}"
-        "    SHA512 $Hash"
+        "vcpkg_from_github(",
+        "    OUT_SOURCE_PATH SOURCE_PATH",
+        "    REPO boostorg/$Library",
+        "    REF boost-`${VERSION}",
+        "    SHA512 $Hash",
         "    HEAD_REF master"
     )
-    [Array]$patches = Get-Item -Path "$portsDir/$portName/*.patch"
-    [Array]$diffs = Get-Item -Path "$portsDir/$portName/*.diff"
-    [Array]$allmods = $patches + $diffs
-    if ($null -eq $allmods -or $allmods.Count -eq 0) {
+
+    [string[]]$allmods = @()
+    $allmods += Get-ChildItem -Path "$portsDir/$portName/*" -Name -Include @('*.patch', '*.diff')
+    if (Test-Path "$scriptsBoostDir/patch-stubs/$Library.txt") {
+        $allmods +=  Get-Content "$scriptsBoostDir/patch-stubs/$Library.txt"
     }
-    else {
+
+    if ($allmods.Length -ne 0) {
         $portfileLines += @("    PATCHES")
         foreach ($patch in $allmods) {
-            $portfileLines += @("        $($patch.name)")
+            $portfileLines += "        $patch"
         }
     }
     $portfileLines += @(
@@ -391,8 +408,8 @@ function GeneratePort() {
         ""
     )
 
-    if (Test-Path "$scriptsDir/post-source-stubs/$Library.cmake") {
-        $portfileLines += @(Get-Content "$scriptsDir/post-source-stubs/$Library.cmake")
+    if (Test-Path "$scriptsBoostDir/post-source-stubs/$Library.cmake") {
+        $portfileLines += @(Get-Content "$scriptsBoostDir/post-source-stubs/$Library.cmake")
     }
 
     $portfileLines += @(
@@ -404,6 +421,10 @@ function GeneratePort() {
         )
     }
 
+    if (Test-Path "$scriptsBoostDir/pre-build-stubs/$Library.cmake") {
+        $portfileLines += Get-Content "$scriptsBoostDir/pre-build-stubs/$Library.cmake"
+    }
+
     $portfileLines += @(
         "boost_configure_and_install("
         "    SOURCE_PATH `"`${SOURCE_PATH}`""
@@ -411,8 +432,8 @@ function GeneratePort() {
         ")"
     )
 
-    if (Test-Path "$scriptsDir/post-build-stubs/$Library.cmake") {
-        $portfileLines += @(Get-Content "$scriptsDir/post-build-stubs/$Library.cmake")
+    if (Test-Path "$scriptsBoostDir/post-build-stubs/$Library.cmake") {
+        $portfileLines += @(Get-Content "$scriptsBoostDir/post-build-stubs/$Library.cmake")
     }
 
     $portfileLines += @("")
@@ -422,9 +443,9 @@ function GeneratePort() {
         -NoNewline
 }
 
-if (!(Test-Path "$scriptsDir/boost")) {
+if (!(Test-Path "$scriptsBoostDir/boost")) {
     "Cloning boost..."
-    Push-Location $scriptsDir
+    Push-Location $scriptsBoostDir
     try {
         git clone https://github.com/boostorg/boost --branch boost-$version
     }
@@ -433,7 +454,7 @@ if (!(Test-Path "$scriptsDir/boost")) {
     }
 }
 else {
-    Push-Location $scriptsDir/boost
+    Push-Location $scriptsBoostDir/boost
     try {
         git fetch
         git checkout -f boost-$version
@@ -443,7 +464,7 @@ else {
     }
 }
 
-$foundLibraries = Get-ChildItem $scriptsDir/boost/libs -directory | ForEach-Object name | ForEach-Object {
+$foundLibraries = Get-ChildItem $scriptsBoostDir/boost/libs -directory | ForEach-Object name | ForEach-Object {
     if ($_ -eq "numeric") {
         "numeric_conversion"
         "interval"
@@ -455,7 +476,7 @@ $foundLibraries = Get-ChildItem $scriptsDir/boost/libs -directory | ForEach-Obje
     }
 }
 
-$downloads = "$scriptsDir/../../downloads"
+$downloads = "$scriptsBoostDir/../../downloads"
 New-Item -ItemType "Directory" $downloads -erroraction SilentlyContinue | out-null
 
 $updateServicePorts = $false
@@ -481,11 +502,11 @@ foreach ($library in $libraries) {
         $hash = $hash[1]
     }
 
-    $unpacked = "$scriptsDir/libs/$library-boost-$version"
+    $unpacked = "$scriptsBoostDir/libs/$library-boost-$version"
     if (!(Test-Path $unpacked)) {
         "Unpacking boost/$library..."
-        New-Item -ItemType "Directory" $scriptsDir/libs -erroraction SilentlyContinue | out-null
-        Push-Location $scriptsDir/libs
+        New-Item -ItemType "Directory" $scriptsBoostDir/libs -erroraction SilentlyContinue | out-null
+        Push-Location $scriptsBoostDir/libs
         try {
             cmake -E tar xf $archive
         }
diff --git a/scripts/boost/patch-stubs/interprocess.txt b/scripts/boost/patch-stubs/interprocess.txt
new file mode 100644
index 00000000000000..42f1fab14190b9
--- /dev/null
+++ b/scripts/boost/patch-stubs/interprocess.txt
@@ -0,0 +1 @@
+${ARM32_PATCH}
\ No newline at end of file
diff --git a/scripts/boost/patch-stubs/json.txt b/scripts/boost/patch-stubs/json.txt
new file mode 100644
index 00000000000000..42f1fab14190b9
--- /dev/null
+++ b/scripts/boost/patch-stubs/json.txt
@@ -0,0 +1 @@
+${ARM32_PATCH}
\ No newline at end of file
diff --git a/scripts/boost/patch-stubs/unordered.txt b/scripts/boost/patch-stubs/unordered.txt
new file mode 100644
index 00000000000000..42f1fab14190b9
--- /dev/null
+++ b/scripts/boost/patch-stubs/unordered.txt
@@ -0,0 +1 @@
+${ARM32_PATCH}
\ No newline at end of file
diff --git a/scripts/boost/pre-build-stubs/iostreams.cmake b/scripts/boost/pre-build-stubs/iostreams.cmake
new file mode 100644
index 00000000000000..93f8759fa71b64
--- /dev/null
+++ b/scripts/boost/pre-build-stubs/iostreams.cmake
@@ -0,0 +1,3 @@
+if (BOOST_IOSTREAMS_ENABLE_ZSTD AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    list(APPEND FEATURE_OPTIONS "-DBOOST_IOSTREAMS_ZSTD_TARGET=zstd::libzstd_static")
+endif()
\ No newline at end of file
diff --git a/scripts/boost/pre-source-stubs/interprocess.cmake b/scripts/boost/pre-source-stubs/interprocess.cmake
new file mode 100644
index 00000000000000..05d07645ed0fd2
--- /dev/null
+++ b/scripts/boost/pre-source-stubs/interprocess.cmake
@@ -0,0 +1,5 @@
+vcpkg_download_distfile(ARM32_PATCH
+    URLS https://github.com/boostorg/interprocess/commit/f58e968f13e693ffaa78fb283972e8598dc48c9f.patch?full_index=1
+    FILENAME boost-interprocess-arm32-f58e968f13e693ffaa78fb283972e8598dc48c9f.patch
+    SHA512 7e9b5ebac8ef3c04327c29bad9b8b6259320fd9ebec80bac905b7bd4f68e5cb4f001e2c80f83a875cc12376df4f3b444b34251ac3ea88962982a147432ef0f7c
+)
diff --git a/scripts/boost/pre-source-stubs/json.cmake b/scripts/boost/pre-source-stubs/json.cmake
new file mode 100644
index 00000000000000..6b1c67709338c1
--- /dev/null
+++ b/scripts/boost/pre-source-stubs/json.cmake
@@ -0,0 +1,5 @@
+vcpkg_download_distfile(ARM32_PATCH
+    URLS https://github.com/boostorg/json/commit/57d42f07158b8ea4a713378c90d22b28ca4787f8.patch?full_index=1
+    FILENAME boost-json-arm32-57d42f07158b8ea4a713378c90d22b28ca4787f8.patch
+    SHA512 d74a43dfc08fb34ba270a4d7de00a4307728567fbb2949f40f649c0e1c63b690d48aacfbc888e4b8075ff55262048700ab6ef669aa4277d6e9bebbbbd5e9473f
+)
diff --git a/scripts/boost/pre-source-stubs/system.cmake b/scripts/boost/pre-source-stubs/system.cmake
new file mode 100644
index 00000000000000..7e346043bd2515
--- /dev/null
+++ b/scripts/boost/pre-source-stubs/system.cmake
@@ -0,0 +1,2 @@
+vcpkg_buildpath_length_warning(37)
+
diff --git a/scripts/boost/pre-source-stubs/unordered.cmake b/scripts/boost/pre-source-stubs/unordered.cmake
new file mode 100644
index 00000000000000..f87249926626c8
--- /dev/null
+++ b/scripts/boost/pre-source-stubs/unordered.cmake
@@ -0,0 +1,5 @@
+vcpkg_download_distfile(ARM32_PATCH
+    URLS https://github.com/boostorg/unordered/commit/07f6463c1c302c5b1d28aa253e0b768e71c90235.patch?full_index=1
+    FILENAME boost-unordered-arm32-07f6463c1c302c5b1d28aa253e0b768e71c90235.patch
+    SHA512 99f631e57b0c7d8d08f32d994c34dbca2588b409c10ad35500c36dc5374dba91888ee5ba3ca7ed24fa75539e9d44ffc123892d859a736f63ca0ae5fffee2c178
+)
\ No newline at end of file
diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json
index 7b83537e42ce38..0c80e58c3c6e19 100644
--- a/versions/b-/boost-asio.json
+++ b/versions/b-/boost-asio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "05c6ddb5e69d7b3397822f72d7b582757e0f8dd7",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "44931d7a20103a76ed5b6c972d65b897ac1ccb4f",
       "version": "1.87.0",
diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json
index 512d6f1616b7fb..5e941dda869b61 100644
--- a/versions/b-/boost-atomic.json
+++ b/versions/b-/boost-atomic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "604e592bcd79c781d31b61016047c9902a8f6856",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1911b3ba2efb61075b17787cbd2413442c1cf3ba",
       "version": "1.87.0",
diff --git a/versions/b-/boost-cobalt.json b/versions/b-/boost-cobalt.json
index b6c1c1ee8310f2..d04f069ef947f1 100644
--- a/versions/b-/boost-cobalt.json
+++ b/versions/b-/boost-cobalt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d5d1dcab9fe0c1d261e288aa7ee4139525c176fa",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "3170096f0dad0549ba65a26d08bfb580927b2c33",
       "version": "1.87.0",
diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json
index 6c56f32e2255b6..d002238387818e 100644
--- a/versions/b-/boost-compute.json
+++ b/versions/b-/boost-compute.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d5075be2df77fd3d932093384f1cc4a532cb89cf",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "86b245ffee801bbd8faf770139b8ae8676eeded2",
       "version": "1.87.0",
diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json
index 04c346323ac913..61277d138025cf 100644
--- a/versions/b-/boost-context.json
+++ b/versions/b-/boost-context.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "41dfcdb2574b9d0f36ee932fabc31bf3f0499a99",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "62513688ab02a8ecd84aa7a7027d026a685c4151",
       "version": "1.87.0",
diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json
index 455edb342c11e4..e96309fba94370 100644
--- a/versions/b-/boost-flyweight.json
+++ b/versions/b-/boost-flyweight.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5711542f8653c419057098ef799e9bdfe75ac16b",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b288beeccb46d1f20a1b2f7ff8c9a61532f1dcc3",
       "version": "1.87.0",
diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json
index 31b2fab4bf0448..3480c7b191a5a2 100644
--- a/versions/b-/boost-interprocess.json
+++ b/versions/b-/boost-interprocess.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "480f6f44c3767ccd6c591ca65aa1f2548369ddc6",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1613f55a28a2a16e1e1e0c8860f59af0598be867",
       "version": "1.87.0",
diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json
index 0ba3f57ea1be52..ca2cee006a236c 100644
--- a/versions/b-/boost-json.json
+++ b/versions/b-/boost-json.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4d2314c91c86fc0e49669d8872030af877de65c5",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7beba32d8cd5110b0b96838ae1d0850bf7e4243b",
       "version": "1.87.0",
diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json
index e60849c2d30cf3..013f84ebf15432 100644
--- a/versions/b-/boost-lexical-cast.json
+++ b/versions/b-/boost-lexical-cast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6bd8ac437eb3b4a61ce0c8b0c3397c16d1cc1ee1",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "83815f0f8964eff4ab8e9e906f4915ae24343c93",
       "version": "1.87.0",
diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json
index 19527477d3125d..682af0a404b1de 100644
--- a/versions/b-/boost-lockfree.json
+++ b/versions/b-/boost-lockfree.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d0e857abd9efe0f3c5cc774d8b392da722e77c80",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b41ece714f102baafb3c5e7fd576880001276b3a",
       "version": "1.87.0",
diff --git a/versions/b-/boost-mysql.json b/versions/b-/boost-mysql.json
index d30a7097209fc3..6d8019fc0d9b0f 100644
--- a/versions/b-/boost-mysql.json
+++ b/versions/b-/boost-mysql.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1f0c61195aa1cb17a4889f164cc5f508747b8403",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "87fad0ef94992093db1e490cd250e0ba7327ad7e",
       "version": "1.87.0",
diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json
index 42817210e10c72..69a8ba772f5c46 100644
--- a/versions/b-/boost-optional.json
+++ b/versions/b-/boost-optional.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fe57251855d60463135bebf003e322373662baa4",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "3aef20f9f24d5920c763778cb7d5adfec48442bb",
       "version": "1.87.0",
diff --git a/versions/b-/boost-parser.json b/versions/b-/boost-parser.json
index 1c324bbc581a60..beab6deee9efc4 100644
--- a/versions/b-/boost-parser.json
+++ b/versions/b-/boost-parser.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0efba19a019c2d68628e48fa3fd1df9450eef24d",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "df0eee92ddcc68d09cffd0a56a44b9dffb3cf96e",
       "version": "1.87.0",
diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json
index eea00566b43e46..f5f1db5811e256 100644
--- a/versions/b-/boost-process.json
+++ b/versions/b-/boost-process.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d81dd97109ef3e859af1af132dff2cff2d254437",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c163954223e02f5a868821c76a7de7df87a9b5da",
       "version": "1.87.0",
diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json
index a771c169f8a1cf..ac5501f3abcc87 100644
--- a/versions/b-/boost-regex.json
+++ b/versions/b-/boost-regex.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0016517b443abba2253c0418a5d90fb69507c62f",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "d4fb73aaa81754b4de20e73602ca10685ed5fafd",
       "version": "1.87.0",
diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json
index a8ebe6bbffc418..ce0edf1331c53b 100644
--- a/versions/b-/boost-unordered.json
+++ b/versions/b-/boost-unordered.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6409ee49a623fa9b3f4cc6b1e6cec7c29dc29d54",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "551ecc5eced9c7be9fc7214868bf5cc0bddd4730",
       "version": "1.87.0",
diff --git a/versions/b-/boost.json b/versions/b-/boost.json
index a9e9a63200508c..ac6d620ad14c97 100644
--- a/versions/b-/boost.json
+++ b/versions/b-/boost.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "66bd9ffe5eb4f4398afca8314b160ca840176bf5",
+      "version": "1.87.0",
+      "port-version": 1
+    },
     {
       "git-tree": "fab05e78b524b75e11139057f589c407984b50c3",
       "version": "1.87.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5ed690f82b69a8..2aed6c9a217534 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -734,7 +734,7 @@
     },
     "boost": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-accumulators": {
       "baseline": "1.87.0",
@@ -758,7 +758,7 @@
     },
     "boost-asio": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-assert": {
       "baseline": "1.87.0",
@@ -770,7 +770,7 @@
     },
     "boost-atomic": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-beast": {
       "baseline": "1.87.0",
@@ -810,7 +810,7 @@
     },
     "boost-cobalt": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-compat": {
       "baseline": "1.87.0",
@@ -822,7 +822,7 @@
     },
     "boost-compute": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-concept-check": {
       "baseline": "1.87.0",
@@ -842,7 +842,7 @@
     },
     "boost-context": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-contract": {
       "baseline": "1.87.0",
@@ -910,7 +910,7 @@
     },
     "boost-flyweight": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-foreach": {
       "baseline": "1.87.0",
@@ -982,7 +982,7 @@
     },
     "boost-interprocess": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-interval": {
       "baseline": "1.87.0",
@@ -1006,7 +1006,7 @@
     },
     "boost-json": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-lambda": {
       "baseline": "1.87.0",
@@ -1022,7 +1022,7 @@
     },
     "boost-lexical-cast": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-local-function": {
       "baseline": "1.87.0",
@@ -1034,7 +1034,7 @@
     },
     "boost-lockfree": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-log": {
       "baseline": "1.87.0",
@@ -1086,7 +1086,7 @@
     },
     "boost-mysql": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-nowide": {
       "baseline": "1.87.0",
@@ -1102,7 +1102,7 @@
     },
     "boost-optional": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-outcome": {
       "baseline": "1.87.0",
@@ -1118,7 +1118,7 @@
     },
     "boost-parser": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-pfr": {
       "baseline": "1.87.0",
@@ -1150,7 +1150,7 @@
     },
     "boost-process": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-program-options": {
       "baseline": "1.87.0",
@@ -1206,7 +1206,7 @@
     },
     "boost-regex": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-safe-numerics": {
       "baseline": "1.87.0",
@@ -1322,7 +1322,7 @@
     },
     "boost-unordered": {
       "baseline": "1.87.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-url": {
       "baseline": "1.87.0",