diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index efddc5c914..ed0aa5a479 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -51,25 +51,38 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32)
     list(APPEND B2_OPTIONS "asmflags=/safeseh")
 endif()
 
-if(MSVC)
-    set(USER_CONFIG_TOOLSET msvc)
-    if(MSVC_VERSION LESS 1900)
-        math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60")
+if(WIN32)
+    if(MSVC)
+        if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            set(USER_CONFIG_TOOLSET clang-win)
+        else()
+            set(USER_CONFIG_TOOLSET msvc)
+        endif()
+        if(MSVC_VERSION LESS 1900)
+            math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60")
+        else()
+            math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50")
+        endif()
     else()
-        math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50")
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            set(USER_CONFIG_TOOLSET clang)
+        else()
+            set(USER_CONFIG_TOOLSET gcc)
+        endif()
     endif()
     list(APPEND B2_OPTIONS target-os=windows)
 elseif(APPLE)
     set(USER_CONFIG_TOOLSET clang)
     list(APPEND B2_OPTIONS target-os=darwin)
-elseif(WIN32)
-    set(USER_CONFIG_TOOLSET gcc)
-    list(APPEND B2_OPTIONS target-os=windows)
 elseif(ANDROID)
     set(USER_CONFIG_TOOLSET gcc)
     list(APPEND B2_OPTIONS target-os=android)
 else()
-    set(USER_CONFIG_TOOLSET gcc)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        set(USER_CONFIG_TOOLSET clang)
+    else()
+        set(USER_CONFIG_TOOLSET gcc)
+    endif()
     list(APPEND B2_OPTIONS target-os=linux)
 endif()
 
diff --git a/ports/boost-modular-build-helper/user-config.jam.in b/ports/boost-modular-build-helper/user-config.jam.in
index fbd6f8d36e..6fbfe39d66 100644
--- a/ports/boost-modular-build-helper/user-config.jam.in
+++ b/ports/boost-modular-build-helper/user-config.jam.in
@@ -17,7 +17,7 @@ if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel"
 
 project user-config : ;
 
-if "@USER_CONFIG_TOOLSET@" = "msvc"
+if "@USER_CONFIG_TOOLSET@" = "msvc" || "@USER_CONFIG_TOOLSET@" = "clang-win"
 {
     lib advapi32 ;
 
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 9daad09884..a4292b000a 100644
--- a/ports/boost-modular-build-helper/vcpkg.json
+++ b/ports/boost-modular-build-helper/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "boost-modular-build-helper",
   "version": "1.77.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Internal vcpkg port used to build Boost libraries",
   "dependencies": [
     "boost-uninstall"
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index ef9108deca..b48154aac2 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "48cc9da813626ac4733698e65368e5581f4efb59",
+      "version": "1.77.0",
+      "port-version": 5
+    },
     {
       "git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa",
       "version": "1.77.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4b744ccbf3..84d6f142e7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -826,7 +826,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.77.0",
-      "port-version": 4
+      "port-version": 5
     },
     "boost-move": {
       "baseline": "1.77.0",