diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json
index 764289f0f7..6aacd8f9c3 100644
--- a/ports/boost-asio/vcpkg.json
+++ b/ports/boost-asio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost-asio",
   "version": "1.80.0",
+  "port-version": 1,
   "description": "Boost asio module",
   "homepage": "https://github.com/boostorg/asio",
   "license": "BSL-1.0",
@@ -18,7 +19,7 @@
     "boost-core",
     {
       "name": "boost-coroutine",
-      "platform": "!arm & !uwp & !emscripten"
+      "platform": "!(arm & windows) & !uwp & !emscripten"
     },
     "boost-date-time",
     "boost-exception",
diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json
index eb4f9b84f8..2ca652abf4 100644
--- a/ports/boost-coroutine/vcpkg.json
+++ b/ports/boost-coroutine/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "boost-coroutine",
   "version": "1.80.0",
+  "port-version": 1,
   "description": "Boost coroutine module",
   "homepage": "https://github.com/boostorg/coroutine",
   "license": "BSL-1.0",
-  "supports": "!arm & !uwp & !emscripten",
+  "supports": "!(arm & windows) & !uwp & !emscripten",
   "dependencies": [
     "boost-assert",
     {
diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json
index 99728cceaa..1c7fc5e356 100644
--- a/ports/boost/vcpkg.json
+++ b/ports/boost/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "boost",
   "version": "1.80.0",
+  "port-version": 1,
   "description": "Peer-reviewed portable C++ source libraries",
   "homepage": "https://boost.org",
   "license": "BSL-1.0",
@@ -39,7 +40,7 @@
     "boost-core",
     {
       "name": "boost-coroutine",
-      "platform": "!arm & !uwp & !emscripten"
+      "platform": "!(arm & windows) & !uwp & !emscripten"
     },
     {
       "name": "boost-coroutine2",
@@ -55,7 +56,7 @@
     "boost-exception",
     {
       "name": "boost-fiber",
-      "platform": "!osx & !uwp & !arm & !emscripten"
+      "platform": "!uwp & !arm & !emscripten"
     },
     {
       "name": "boost-filesystem",
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 0c6fae9ec6..6e587c2d0c 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -25,6 +25,11 @@ else {
 $portVersions = @{
     #e.g. "boost-asio" = 1;
     "boost-fiber" = 1;
+    "boost-coroutine" = 1;
+    "boost" = 1;
+    "boost-asio" = 1;
+    "boost-build" = 1;
+    "boost-modular-build-helper" = 1;
 }
 
 $portData = @{
@@ -78,7 +83,7 @@ $portData = @{
     };
     "boost-context"          = @{ "supports" = "!uwp & !emscripten" };
     "boost-stacktrace"       = @{ "supports" = "!uwp" };
-    "boost-coroutine"        = @{ "supports" = "!arm & !uwp & !emscripten" };
+    "boost-coroutine"        = @{ "supports" = "!(arm & windows) & !uwp & !emscripten" };
     "boost-coroutine2"       = @{ "supports" = "!emscripten" };
     "boost-test"             = @{ "supports" = "!uwp" };
     "boost-wave"             = @{ "supports" = "!uwp" };
diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json
index 0b6f318118..8b4a933dae 100644
--- a/versions/b-/boost-asio.json
+++ b/versions/b-/boost-asio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5ee085e21ed4445f2cb442f39fd91c77f79a80e4",
+      "version": "1.80.0",
+      "port-version": 1
+    },
     {
       "git-tree": "2879fa47cd2ac0abbd8ad8c1b38fa28605c45bee",
       "version": "1.80.0",
diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json
index c6107fdddb..dfb1459df0 100644
--- a/versions/b-/boost-coroutine.json
+++ b/versions/b-/boost-coroutine.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "58decd230ff2227603af8e6e95dfcf45fab3b032",
+      "version": "1.80.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c5c4a955fcf3465c0e9589a57d9c9f2df02eb3a2",
       "version": "1.80.0",
diff --git a/versions/b-/boost.json b/versions/b-/boost.json
index 86076e72ba..5a31edaeb3 100644
--- a/versions/b-/boost.json
+++ b/versions/b-/boost.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dd28384ddceb935eecbc6e787b67e2a9b506aab3",
+      "version": "1.80.0",
+      "port-version": 1
+    },
     {
       "git-tree": "f4e929db67c1d0b4c043ec1f1f1d1f1157029d99",
       "version": "1.80.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 72b61df184..a1967ae42a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -558,7 +558,7 @@
     },
     "boost": {
       "baseline": "1.80.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-accumulators": {
       "baseline": "1.80.0",
@@ -582,7 +582,7 @@
     },
     "boost-asio": {
       "baseline": "1.80.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-assert": {
       "baseline": "1.80.0",
@@ -670,7 +670,7 @@
     },
     "boost-coroutine": {
       "baseline": "1.80.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-coroutine2": {
       "baseline": "1.80.0",