diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index dfc10343a7f519..74f2a6f6a0b1db 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -131,41 +131,42 @@ string(REGEX REPLACE "[ \t\r\n]+" " " LDFLAGS "${LDFLAGS}")
 string(STRIP "${LDFLAGS}" LDFLAGS)
 
 if(NOT CXXFLAGS STREQUAL "")
-    string(REPLACE " " " <cxxflags>" CXXFLAGS "<cxxflags>${CXXFLAGS}")
+    string(REPLACE " " "\" <cxxflags>\"" CXXFLAGS "<cxxflags>\"${CXXFLAGS}\"")
 endif()
 if(NOT CFLAGS STREQUAL "")
-    string(REPLACE " " " <cflags>" CFLAGS "<cflags>${CFLAGS}")
+    string(REPLACE " " "\" <cflags>\"" CFLAGS "<cflags>\"${CFLAGS}\"")
 endif()
 if(NOT LDFLAGS STREQUAL "")
-    string(REPLACE " " " <linkflags>" LDFLAGS "<linkflags>${LDFLAGS}")
+    list(APPEND B2_OPTIONS "linkflags=${LDFLAGS}")
+    string(REPLACE " " "\" <linkflags>\"" LDFLAGS "<linkflags>\"${LDFLAGS}\"")
 endif()
 
 if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
-        string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}")
+        string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"")
+        string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}\"")
     else()
-        string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <compileflags>${CMAKE_CXX_COMPILER_TARGET}")
-        string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <linkflags>${CMAKE_CXX_COMPILER_TARGET}")
+        string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}\" <compileflags>\"${CMAKE_CXX_COMPILER_TARGET}\"")
+        string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_TARGET}\" <linkflags>\"${CMAKE_CXX_COMPILER_TARGET}\"")
     endif()
 endif()
 
 if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
-        string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+        string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
+        string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
     else()
-        string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <compileflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
-        string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <linkflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+        string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}\" <compileflags>\"${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
+        string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}\" <linkflags>\"${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}\"")
     endif()
 endif()
 
 if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT)
-    string(APPEND CXXFLAGS " <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
-    string(APPEND LDFLAGS " <linkflags>${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
+    string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"")
+    string(APPEND LDFLAGS " <linkflags>\"${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}\"")
 endif()
 foreach(INCDIR IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES)
-    string(APPEND CXXFLAGS " <compileflags>${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}")
+    string(APPEND CXXFLAGS " <compileflags>\"${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}\"")
 endforeach()
 
 if(APPLE)
diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
index 31ea55e28933e1..e4c24ad9110422 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.78.0",
-  "port-version": 2,
+  "port-version": 3,
   "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 e45e0fbada2b09..a7a192e28cbe72 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "12cac3fda2ecd2e2a67465af72d133541d45355f",
+      "version": "1.78.0",
+      "port-version": 3
+    },
     {
       "git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6",
       "version": "1.78.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 881b85f99ddef2..38ecc5748e03e6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -822,7 +822,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.78.0",
-      "port-version": 2
+      "port-version": 3
     },
     "boost-move": {
       "baseline": "1.78.0",