diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
index da4ae262fa..f153d68904 100644
--- a/ports/cppgraphqlgen/portfile.cmake
+++ b/ports/cppgraphqlgen/portfile.cmake
@@ -17,7 +17,9 @@ vcpkg_from_github(
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
+        clientgen   GRAPHQL_BUILD_CLIENTGEN
         rapidjson   GRAPHQL_USE_RAPIDJSON
+        schemagen   GRAPHQL_BUILD_SCHEMAGEN
 )
 
 vcpkg_cmake_configure(
@@ -40,9 +42,19 @@ vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup()
 
-vcpkg_copy_tools(
-    TOOL_NAMES schemagen clientgen
-    SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
+set(tools "")
+if ("clientgen" IN_LIST FEATURES)
+    list(APPEND tools clientgen)
+endif()
+if ("schemagen" IN_LIST FEATURES)
+    list(APPEND tools schemagen)
+endif()
+list(LENGTH tools num_tools)
+if (num_tools GREATER 0)
+    vcpkg_copy_tools(
+        TOOL_NAMES ${tools}
+        SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
+endif()
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json
index c12ec19b59..0dd4ed2f10 100644
--- a/ports/cppgraphqlgen/vcpkg.json
+++ b/ports/cppgraphqlgen/vcpkg.json
@@ -1,12 +1,11 @@
 {
   "name": "cppgraphqlgen",
   "version": "4.5.7",
-  "port-version": 1,
+  "port-version": 2,
   "description": "C++ GraphQL schema service generator",
   "homepage": "https://github.com/microsoft/cppgraphqlgen",
   "license": "MIT",
   "dependencies": [
-    "boost-program-options",
     "pegtl",
     {
       "name": "vcpkg-cmake",
@@ -21,11 +20,23 @@
     "rapidjson"
   ],
   "features": {
+    "clientgen": {
+      "description": "Build the clientgen CLI tool.",
+      "dependencies": [
+        "boost-program-options"
+      ]
+    },
     "rapidjson": {
       "description": "Build the graphqljson library with RapidJSON.",
       "dependencies": [
         "rapidjson"
       ]
+    },
+    "schemagen": {
+      "description": "Build the schemagen CLI tool.",
+      "dependencies": [
+        "boost-program-options"
+      ]
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index ffa29baabb..cb756c9d0a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1966,7 +1966,7 @@
     },
     "cppgraphqlgen": {
       "baseline": "4.5.7",
-      "port-version": 1
+      "port-version": 2
     },
     "cppitertools": {
       "baseline": "2.1",
diff --git a/versions/c-/cppgraphqlgen.json b/versions/c-/cppgraphqlgen.json
index fa8464a6ce..a3c5dc46d2 100644
--- a/versions/c-/cppgraphqlgen.json
+++ b/versions/c-/cppgraphqlgen.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3ad7f8b9f23c95604d6fe6cd0710af8a4ea99176",
+      "version": "4.5.7",
+      "port-version": 2
+    },
     {
       "git-tree": "6fa915d7e50edceda898664f00c7860694433fab",
       "version": "4.5.7",