diff --git a/ports/boost-cobalt/fail-on-compiler-not-supported.patch b/ports/boost-cobalt/fail-on-compiler-not-supported.patch
new file mode 100644
index 0000000000..db564c659e
--- /dev/null
+++ b/ports/boost-cobalt/fail-on-compiler-not-supported.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5a51d5285c..8374f911a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@ project(boost_cobalt VERSION "${BOOST_COBALT_VERSION}" LANGUAGES CXX)
+ 
+ include(cmake/CheckRequirements.cmake)
+ if (NOT BOOST_COBALT_REQUIREMENTS_MATCHED)
+-    return()
++    message(FATAL_ERROR "The current compiler is not supported.")
+ endif()
+ 
+ set(BOOST_COBALT_IS_ROOT OFF)
diff --git a/ports/boost-cobalt/portfile.cmake b/ports/boost-cobalt/portfile.cmake
index 5bfee935b3..9938c6bbbf 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
@@ -6,6 +6,9 @@ vcpkg_from_github(
     REF boost-${VERSION}
     SHA512 a92ff4050772b61035121f944d81d4a9d6d2da858dedc0956ad850132657c80c660a8839a99597443751744577dd5b0958239e99d948d3036c85b8361151aa27
     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 9fa189bb86..b047221032 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.86.0",
+  "port-version": 1,
   "description": "Boost cobalt module",
   "homepage": "https://www.boost.org/libs/cobalt",
   "license": "BSL-1.0",
diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json
index d831b83de1..d0727aa58e 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.86.0",
+  "port-version": 1,
   "description": "Peer-reviewed portable C++ source libraries",
   "homepage": "https://boost.org",
   "license": "BSL-1.0",
@@ -71,11 +72,6 @@
       "name": "boost-circular-buffer",
       "version>=": "1.86.0"
     },
-    {
-      "name": "boost-cobalt",
-      "platform": "!osx & !ios & !android & !uwp",
-      "version>=": "1.86.0"
-    },
     {
       "name": "boost-compat",
       "version>=": "1.86.0"
@@ -627,6 +623,16 @@
     }
   ],
   "features": {
+    "cobalt": {
+      "description": "Build boost-cobalt",
+      "dependencies": [
+        {
+          "name": "boost-cobalt",
+          "platform": "!osx & !ios & !android & !uwp",
+          "version>=": "1.86.0"
+        }
+      ]
+    },
     "mpi": {
       "description": "Build with MPI support",
       "dependencies": [
diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
index 11db02b520..3efa59efcb 100644
--- a/scripts/boost/generate-ports.ps1
+++ b/scripts/boost/generate-ports.ps1
@@ -28,7 +28,9 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
 # Clear this array when moving to a new boost version
 $defaultPortVersion = 0
 $portVersions = @{
-    'boost-build'           = 1
+    'boost'                 = 1;
+    'boost-build'           = 1;
+    'boost-cobalt'          = 1
 }
 
 function Get-PortVersion {
@@ -50,6 +52,10 @@ $portData = @{
             "mpi" = @{
                 "description"  = "Build with MPI support";
                 "dependencies" = @("boost-mpi", "boost-graph-parallel", "boost-property-map-parallel");
+            };
+            "cobalt" = @{
+                "description"  = "Build boost-cobalt";
+                "dependencies" = @("boost-cobalt");
             }
         }
     };
diff --git a/versions/b-/boost-cobalt.json b/versions/b-/boost-cobalt.json
index 3c4abc3667..67251fb50c 100644
--- a/versions/b-/boost-cobalt.json
+++ b/versions/b-/boost-cobalt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3195a6c18219720b8c98b5d449ff39b95535122e",
+      "version": "1.86.0",
+      "port-version": 1
+    },
     {
       "git-tree": "d45758e6c62b46ef436df6cffe7803dfc3ba8f10",
       "version": "1.86.0",
diff --git a/versions/b-/boost.json b/versions/b-/boost.json
index e745a73d06..ae6a9d728a 100644
--- a/versions/b-/boost.json
+++ b/versions/b-/boost.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "15e0de9e647ed1ddf684158c8dc629544c2fe53b",
+      "version": "1.86.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e16c1af1e47c7b94ac02c8f3c9ec0f4d3ea8f8f6",
       "version": "1.86.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index aa0ee187e6..3a08c281e2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -742,7 +742,7 @@
     },
     "boost": {
       "baseline": "1.86.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-accumulators": {
       "baseline": "1.86.0",
@@ -818,7 +818,7 @@
     },
     "boost-cobalt": {
       "baseline": "1.86.0",
-      "port-version": 0
+      "port-version": 1
     },
     "boost-compat": {
       "baseline": "1.86.0",