diff --git a/ports/mongo-cxx-driver/cmake-project-include.cmake b/ports/mongo-cxx-driver/cmake-project-include.cmake
new file mode 100644
index 0000000000..4c4f5b09e6
--- /dev/null
+++ b/ports/mongo-cxx-driver/cmake-project-include.cmake
@@ -0,0 +1,4 @@
+if(BSONCXX_POLY_USE_STD AND NOT CMAKE_CXX_STANDARD VERSION_GREATER_EQUAL "17")
+    message(WARNING "Enabling C++17 compiler support.")
+    set(CMAKE_CXX_STANDARD 17)
+endif()
diff --git a/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch b/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch
deleted file mode 100644
index eb4245c4bd..0000000000
--- a/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2f7a16aa1..326edd332 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -14,6 +14,7 @@
- 
- add_definitions(-DMONGO_CXX_DRIVER_COMPILING)
- add_definitions(-D_SCL_SECURE_NO_WARNINGS)
-+add_definitions(-D_DISABLE_EXTENDED_ALIGNED_STORAGE)
- add_subdirectory(bsoncxx)
- add_subdirectory(mongocxx)
- 
diff --git a/ports/mongo-cxx-driver/disable_test_and_example.patch b/ports/mongo-cxx-driver/disable_test_and_example.patch
deleted file mode 100644
index dde496df42..0000000000
--- a/ports/mongo-cxx-driver/disable_test_and_example.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2bc2a17c..347faa5ca 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -190,6 +190,7 @@ set (BUILD_SOURCE_DIR ${CMAKE_BINARY_DIR})
- 
- include (MakeDistFiles)
- 
-+if(0)
- add_custom_target(hugo_dir
-     COMMAND ${CMAKE_COMMAND} -E make_directory hugo
- )
-@@ -248,6 +249,8 @@ add_custom_target(docs
- 
- set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
- 
-+endif()
-+
- enable_testing()
- 
- add_subdirectory(src)
-diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
-index 480b7cd32..b890c36b6 100644
---- a/src/bsoncxx/CMakeLists.txt
-+++ b/src/bsoncxx/CMakeLists.txt
-@@ -204,7 +204,7 @@ if(BSONCXX_BUILD_STATIC)
- endif()
- bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}")
- 
--add_subdirectory(test)
-+# add_subdirectory(test)
- 
- set_local_dist (src_bsoncxx_DIST_local
-    CMakeLists.txt
-diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
-index f67ae35f7..b783a4716 100644
---- a/src/mongocxx/CMakeLists.txt
-+++ b/src/mongocxx/CMakeLists.txt
-@@ -231,7 +231,7 @@ if(MONGOCXX_BUILD_STATIC)
- endif()
- mongocxx_install("${mongocxx_target_list}" "${mongocxx_pkg_dep}")
- 
--add_subdirectory(test)
-+# add_subdirectory(test)
- 
- set_local_dist (src_mongocxx_DIST_local
-    CMakeLists.txt
diff --git a/ports/mongo-cxx-driver/fix-dependencies.patch b/ports/mongo-cxx-driver/fix-dependencies.patch
index 09d9f06e75..fde0d3b666 100644
--- a/ports/mongo-cxx-driver/fix-dependencies.patch
+++ b/ports/mongo-cxx-driver/fix-dependencies.patch
@@ -1,11 +1,14 @@
-diff --git a/src/bsoncxx/cmake/bsoncxx-config.cmake.in b/src/bsoncxx/cmake/bsoncxx-config.cmake.in
-index 768f3dde6..6dc7f064b 100644
---- a/src/bsoncxx/cmake/bsoncxx-config.cmake.in
-+++ b/src/bsoncxx/cmake/bsoncxx-config.cmake.in
-@@ -1,3 +1,6 @@
- include(CMakeFindDependencyMacro)
- @BSONCXX_PKG_DEP@
-+if("@Boost_FOUND@")
-+    find_dependency(Boost 1.56.0 REQUIRED)
-+endif()
- include("${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets.cmake")
+diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
+index d87d588..16ba095 100644
+--- a/src/bsoncxx/CMakeLists.txt
++++ b/src/bsoncxx/CMakeLists.txt
+@@ -218,6 +221,9 @@ if(BSONCXX_BUILD_STATIC)
+     bsoncxx_install_deprecated_cmake(bsoncxx-static)
+     list(APPEND bsoncxx_target_list bsoncxx_static)
+     set(bsoncxx_pkg_dep "find_dependency(bson-1.0 REQUIRED)")
++    if(BSONCXX_POLY_USE_BOOST)
++        string(APPEND bsoncxx_pkg_dep "\nfind_dependency(Boost)")
++    endif()
+ endif()
+ bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}")
+ 
diff --git a/ports/mongo-cxx-driver/fix-msvc-cxx17.patch b/ports/mongo-cxx-driver/fix-msvc-cxx17.patch
new file mode 100644
index 0000000000..be52e99b79
--- /dev/null
+++ b/ports/mongo-cxx-driver/fix-msvc-cxx17.patch
@@ -0,0 +1,13 @@
+diff --git a/src/bsoncxx/stdx/make_unique.hpp b/src/bsoncxx/stdx/make_unique.hpp
+index d954eae..c4dea9d 100644
+--- a/src/bsoncxx/stdx/make_unique.hpp
++++ b/src/bsoncxx/stdx/make_unique.hpp
+@@ -48,7 +48,7 @@ using ::boost::make_unique;
+ BSONCXX_INLINE_NAMESPACE_END
+ }  // namespace bsoncxx
+ 
+-#elif __cplusplus >= 201402L
++#elif __cplusplus >= 201402L || defined(_MSVC_LANG)
+ 
+ #include <memory>
+ 
diff --git a/ports/mongo-cxx-driver/fix-uwp.patch b/ports/mongo-cxx-driver/fix-uwp.patch
deleted file mode 100644
index 84a1d6ae32..0000000000
--- a/ports/mongo-cxx-driver/fix-uwp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d1bf5e944..2f7a16aa1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -13,6 +13,7 @@
- # limitations under the License.
- 
- add_definitions(-DMONGO_CXX_DRIVER_COMPILING)
-+add_definitions(-D_SCL_SECURE_NO_WARNINGS)
- add_subdirectory(bsoncxx)
- add_subdirectory(mongocxx)
- 
diff --git a/ports/mongo-cxx-driver/github-654.patch b/ports/mongo-cxx-driver/github-654.patch
deleted file mode 100644
index 61ce426e04..0000000000
--- a/ports/mongo-cxx-driver/github-654.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/mongocxx/instance.cpp b/src/mongocxx/instance.cpp
-index f12bd84a8..acc570fa9 100644
---- a/src/mongocxx/instance.cpp
-+++ b/src/mongocxx/instance.cpp
-@@ -75,9 +75,10 @@ typename std::aligned_storage<sizeof(instance), alignof(instance)>::type sentine
- std::atomic<instance*> current_instance{nullptr};
- static_assert(std::is_standard_layout<decltype(current_instance)>::value,
-               "Must be standard layout");
-+#if (!defined(_MSVC_STL_VERSION))
- static_assert(std::is_trivially_destructible<decltype(current_instance)>::value,
-               "Must be trivially destructible");
--
-+#endif
- }  // namespace
- 
- class instance::impl {
diff --git a/ports/mongo-cxx-driver/libbsoncxx-config.cmake b/ports/mongo-cxx-driver/libbsoncxx-config.cmake
new file mode 100644
index 0000000000..33a3e5aeda
--- /dev/null
+++ b/ports/mongo-cxx-driver/libbsoncxx-config.cmake
@@ -0,0 +1,9 @@
+include(CMakeFindDependencyMacro)
+find_dependency(libbsoncxx-static ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG)
+set(LIBBSONCXX_VERSION_MAJOR "${LIBBSONCXX_STATIC_VERSION_MAJOR}")
+set(LIBBSONCXX_VERSION_MINOR "${LIBBSONCXX_STATIC_VERSION_MINOR}")
+set(LIBBSONCXX_VERSION_PATCH "${LIBBSONCXX_STATIC_VERSION_PATCH}")
+set(LIBBSONCXX_PACKAGE_VERSION "${LIBBSONCXX_STATIC_PACKAGE_VERSION}")
+set(LIBBSONCXX_DEFINITIONS "${LIBBSONCXX_STATIC_DEFINITIONS}")
+set(LIBBSONCXX_INCLUDE_DIRS "${LIBBSONCXX_STATIC_INCLUDE_DIRS}")
+set(LIBBSONCXX_LIBRARIES "${LIBBSONCXX_STATIC_LIBRARIES}")
diff --git a/ports/mongo-cxx-driver/libmongocxx-config.cmake b/ports/mongo-cxx-driver/libmongocxx-config.cmake
new file mode 100644
index 0000000000..faba20f259
--- /dev/null
+++ b/ports/mongo-cxx-driver/libmongocxx-config.cmake
@@ -0,0 +1,9 @@
+include(CMakeFindDependencyMacro)
+find_dependency(libmongocxx-static ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG)
+set(LIBMONGOCXX_VERSION_MAJOR "${LIBMONGOCXX_STATIC_VERSION_MAJOR}")
+set(LIBMONGOCXX_VERSION_MINOR "${LIBMONGOCXX_STATIC_VERSION_MINOR}")
+set(LIBMONGOCXX_VERSION_PATCH "${LIBMONGOCXX_STATIC_VERSION_PATCH}")
+set(LIBMONGOCXX_PACKAGE_VERSION "${LIBMONGOCXX_STATIC_PACKAGE_VERSION}")
+set(LIBMONGOCXX_DEFINITIONS "${LIBMONGOCXX_STATIC_DEFINITIONS}")
+set(LIBMONGOCXX_INCLUDE_DIRS "${LIBMONGOCXX_STATIC_INCLUDE_DIRS}")
+set(LIBMONGOCXX_LIBRARIES "${LIBMONGOCXX_STATIC_LIBRARIES}")
diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake
index 4b03c74d33..b2634c2888 100644
--- a/ports/mongo-cxx-driver/portfile.cmake
+++ b/ports/mongo-cxx-driver/portfile.cmake
@@ -1,111 +1,80 @@
-set(VERSION_MAJOR 3)
-set(VERSION_MINOR 6)
-set(VERSION_PATCH 5)
-set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-set(BSONCXX_STANDARD 11)
+vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mongodb/mongo-cxx-driver
-    REF r${VERSION_FULL}
-    SHA512 fe304d2f406f65d79a030dcfd1509543a9ab3057e46328d5ca1fc58da04758b9a2c6666a6194d574f9b42022324972d41c37d00d6fba87dfba63fbfb99e821de
+    REF "r${VERSION}"
+    SHA512 d30404b0201bd211633b167d874406598481c69de85a00034dfde8b6bc38cced59f7b705327c239b16231f9570bfc2bf29659fef9bb18338fcb8af04403169e2
     HEAD_REF master
     PATCHES
-        fix-uwp.patch
-        disable-c2338-mongo-cxx-driver.patch
-        disable_test_and_example.patch
-        github-654.patch
         fix-dependencies.patch
+        fix-msvc-cxx17.patch
 )
+file(WRITE "${SOURCE_PATH}/build/VERSION_CURRENT" "${VERSION}")
 
-if ("mnmlstc" IN_LIST FEATURES)
-    if (VCPKG_TARGET_IS_WINDOWS)
-        message(FATAL_ERROR "Feature mnmlstc only supports UNIX")
-    endif()
-    set(BSONCXX_POLY MNMLSTC)
-elseif ("system-mnmlstc" IN_LIST FEATURES)
-    message("Please make sure you have mnmlstc installed via the package manager")
-    set(BSONCXX_POLY SYSTEM_MNMLSTC)
-elseif ("boost" IN_LIST FEATURES)
-    set(BSONCXX_POLY BOOST)
-elseif("std-experimental" IN_LIST FEATURES)
-    set(BSONCXX_POLY STD_EXPERIMENTAL)
-    set(BSONCXX_STANDARD 17)
-else()
-  if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    set(BSONCXX_POLY BOOST)
-  else()
-    set(BSONCXX_POLY MNMLSTC)
-  endif()
-endif()
+# This port offered C++17 ABI alternative via features.
+# This was reduced to boost only.
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        boost   BSONCXX_POLY_USE_BOOST
+    INVERTED_FEATURES
+        boost   BSONCXX_POLY_USE_STD
+        boost   CMAKE_DISABLE_FIND_PACKAGE_Boost
+)
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DMONGOCXX_HEADER_INSTALL_DIR=include
+        ${FEATURE_OPTIONS}
+        "-DCMAKE_PROJECT_MONGO_CXX_DRIVER_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
         -DBSONCXX_HEADER_INSTALL_DIR=include
-        -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1
-        -DCMAKE_CXX_STANDARD=${BSONCXX_STANDARD}
-        -DBUILD_VERSION=${VERSION_FULL}
+        -DENABLE_TESTS=OFF
+        -DENABLE_UNINSTALL=OFF
+        -DMONGOCXX_HEADER_INSTALL_DIR=include
+    MAYBE_UNUSED_VARIABLES
+        CMAKE_DISABLE_FIND_PACKAGE_Boost
 )
-
 vcpkg_cmake_install()
-
 vcpkg_copy_pdbs()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME bsoncxx CONFIG_PATH "lib/cmake/bsoncxx-${VERSION_FULL}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
-vcpkg_cmake_config_fixup(PACKAGE_NAME mongocxx CONFIG_PATH "lib/cmake/mongocxx-${VERSION_FULL}")
-
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/libbsoncxx/libbsoncxx-config.cmake"
-"
-message(WARNING \"This CMake target is deprecated.  Use mongo::bsoncxx instead.\")
-
-set(LIBBSONCXX_VERSION_MAJOR ${VERSION_MAJOR})
-set(LIBBSONCXX_VERSION_MINOR ${VERSION_MINOR})
-set(LIBBSONCXX_VERSION_PATCH ${VERSION_PATCH})
-set(LIBBSONCXX_PACKAGE_VERSION ${VERSION_FULL})
-
-include(CMakeFindDependencyMacro)
-find_dependency(bsoncxx CONFIG REQUIRED)
-get_filename_component(LIBBSONCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE)
-if (TARGET mongo::bsoncxx_shared)
-    set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_shared)
-else()
-    set(LIBBSONCXX_LIBRARIES mongo::bsoncxx_static)
-endif()
-"
-)
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongocxx/libmongocxx-config.cmake
-"
-message(WARNING \"This CMake target is deprecated.  Use mongo::mongocxx instead.\")
-
-set(LIBMONGOCXX_VERSION_MAJOR ${VERSION_MAJOR})
-set(LIBMONGOCXX_VERSION_MINOR ${VERSION_MINOR})
-set(LIBMONGOCXX_VERSION_PATCH ${VERSION_PATCH})
-set(LIBMONGOCXX_PACKAGE_VERSION ${VERSION_FULL})
-
-include(CMakeFindDependencyMacro)
-find_dependency(mongocxx CONFIG REQUIRED)
-get_filename_component(LIBMONGOCXX_INCLUDE_DIRS \"\${CMAKE_CURRENT_LIST_DIR}/../../include\" ABSOLUTE)
-if (TARGET mongo::bsoncxx_shared)
-    set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_shared)
-else()
-    set(LIBMONGOCXX_LIBRARIES mongo::mongocxx_static)
-endif()
-"
-)
-
 vcpkg_fixup_pkgconfig()
 
-if (NOT BSONCXX_POLY STREQUAL MNMLSTC)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party")
+vcpkg_cmake_config_fixup(PACKAGE_NAME "bsoncxx" CONFIG_PATH "lib/cmake/bsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME "mongocxx" CONFIG_PATH "lib/cmake/mongocxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/export.hpp"
+        "#define BSONCXX_API_H" "#define BSONCXX_API_H\n#ifndef BSONCXX_STATIC\n#define BSONCXX_STATIC\n#endif")
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx-static" CONFIG_PATH "lib/cmake/libbsoncxx-static-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libbsoncxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libbsoncxx")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mongocxx/config/export.hpp"
+        "#define MONGOCXX_API_H" "#define MONGOCXX_API_H\n#ifndef MONGOCXX_STATIC\n#define MONGOCXX_STATIC\n#endif")
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx-static" CONFIG_PATH "lib/cmake/libmongocxx-static-${VERSION}")
+    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libmongocxx-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libmongocxx")
+else()
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "libbsoncxx" CONFIG_PATH "lib/cmake/libbsoncxx-${VERSION}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
+    vcpkg_cmake_config_fixup(PACKAGE_NAME "libmongocxx" CONFIG_PATH "lib/cmake/libmongocxx-${VERSION}")
 endif()
 
 file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/share"
     "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
 )
-file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/uninstall.sh")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-file(COPY "${SOURCE_PATH}/THIRD-PARTY-NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+function(auto_clean dir)
+    file(GLOB entries "${dir}/*")
+    file(GLOB files LIST_DIRECTORIES false "${dir}/*")
+    foreach(entry IN LISTS entries)
+        if(entry IN_LIST files)
+            continue()
+        endif()
+        file(GLOB_RECURSE children "${entry}/*")
+        if(children)
+            auto_clean("${entry}")
+        else()
+            file(REMOVE_RECURSE "${entry}")
+        endif()
+    endforeach()
+endfunction()
+auto_clean("${CURRENT_PACKAGES_DIR}/include")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/mongo-cxx-driver/usage b/ports/mongo-cxx-driver/usage
new file mode 100644
index 0000000000..f02fb8196d
--- /dev/null
+++ b/ports/mongo-cxx-driver/usage
@@ -0,0 +1,7 @@
+mongo-cxx-driver provides CMake targets:
+
+    find_package(bsoncxx CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:mongo::bsoncxx_static>,mongo::bsoncxx_static,mongo::bsoncxx_shared>)
+
+    find_package(mongocxx CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:mongo::mongocxx_static>,mongo::mongocxx_static,mongo::mongocxx_shared>)
diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json
index c76a2a49a2..83782350d7 100644
--- a/ports/mongo-cxx-driver/vcpkg.json
+++ b/ports/mongo-cxx-driver/vcpkg.json
@@ -1,14 +1,10 @@
 {
   "name": "mongo-cxx-driver",
-  "version": "3.6.5",
-  "port-version": 3,
+  "version": "3.7.0",
   "description": "MongoDB C++ Driver.",
   "homepage": "https://github.com/mongodb/mongo-cxx-driver",
   "license": "Apache-2.0",
   "dependencies": [
-    "boost-optional",
-    "boost-smart-ptr",
-    "boost-utility",
     "libbson",
     "mongo-c-driver",
     {
@@ -22,16 +18,15 @@
   ],
   "features": {
     "boost": {
-      "description": "Use Boost C++17 polyfill. The only option under MSVC."
-    },
-    "mnmlstc": {
-      "description": "Use MNMLSTC/core C++17 polyfill."
-    },
-    "std-experimental": {
-      "description": "Use optional and string_view from std::experimental."
-    },
-    "system-mnmlstc": {
-      "description": "Use an available version of MNMLSTC on your system as C++17 polyfill."
+      "description": [
+        "Enables the Boost C++17 polyfill for bsoncxx.",
+        "Warning: This feature changes the ABI."
+      ],
+      "dependencies": [
+        "boost-optional",
+        "boost-smart-ptr",
+        "boost-utility"
+      ]
     }
   }
 }
diff --git a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake
new file mode 100644
index 0000000000..065116c276
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/portfile.cmake
@@ -0,0 +1 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json
new file mode 100644
index 0000000000..3eb7d03929
--- /dev/null
+++ b/scripts/test_ports/vcpkg-ci-mongo-cxx-driver/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "vcpkg-ci-mongo-cxx-driver",
+  "version-date": "2022-11-18",
+  "description": "Ensures that the vcpkg CI build of mongo-cxx-driver includes feature boost",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "mongo-cxx-driver",
+      "features": [
+        "boost"
+      ]
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 40c444743c..10a524cccf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4929,8 +4929,8 @@
       "port-version": 0
     },
     "mongo-cxx-driver": {
-      "baseline": "3.6.5",
-      "port-version": 3
+      "baseline": "3.7.0",
+      "port-version": 0
     },
     "mongoose": {
       "baseline": "7.6",
diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json
index 38482de4ae..55cd6285a8 100644
--- a/versions/m-/mongo-cxx-driver.json
+++ b/versions/m-/mongo-cxx-driver.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b1003de5a9787e8f819b67f4ca0fdf709af706e5",
+      "version": "3.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "732830e44f7d4c9c31025d6c77e7d40220abef38",
       "version": "3.6.5",