diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index 8f547b8233..d5126885e6 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -1353,8 +1353,8 @@
       "port-version": 0
     },
     "cppgraphqlgen": {
-      "baseline": "2020-12-07",
-      "port-version": 1
+      "baseline": "3.5.0",
+      "port-version": 0
     },
     "cppitertools": {
       "baseline": "2.0",
diff --git a/port_versions/c-/cppgraphqlgen.json b/port_versions/c-/cppgraphqlgen.json
index 62aa232729..6d36e382ce 100644
--- a/port_versions/c-/cppgraphqlgen.json
+++ b/port_versions/c-/cppgraphqlgen.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "96ba69c23cf51b45ff8fe1206a3c134b11eed8b7",
+      "version-semver": "3.5.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2aab4f37ff7fc5961bfd7b91197c03d7ceb13a4a",
       "version-string": "2020-12-07",
diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
deleted file mode 100644
index ed84a7ac3f..0000000000
--- a/ports/cppgraphqlgen/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: cppgraphqlgen
-Version: 2020-12-07
-Port-Version: 1
-Build-Depends: boost-program-options, pegtl, rapidjson
-Description: C++ GraphQL schema service generator
-Homepage: https://github.com/microsoft/cppgraphqlgen
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
index 5cdc17faab..7b7ca7953d 100644
--- a/ports/cppgraphqlgen/portfile.cmake
+++ b/ports/cppgraphqlgen/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/cppgraphqlgen
-    REF fb4a589c84c102d867e7bfb03884d40f7776315b
-    SHA512 88fedd83b49ae25f2165cff8e3a5e3e46ed853312658924f08b3192c790e92583dc8b8f7a88f39ec17798bd7d986143a78633a89d3867400539c4d315015e29b
+    REF v3.5.0
+    SHA512 88f5dde9093899e506d12eabfb8016fe277f12c6b121d5804a0f233bce727a80cad27616295a86807e2f48d14ffdd61bb1697c9c61e4dad025f88f4900ca1453
     HEAD_REF main
 )
 
@@ -26,7 +26,9 @@ vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
+vcpkg_copy_tools(
+    TOOL_NAMES schemagen
+    SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/cppgraphqlgen/vcpkg.json b/ports/cppgraphqlgen/vcpkg.json
new file mode 100644
index 0000000000..65664e51c0
--- /dev/null
+++ b/ports/cppgraphqlgen/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "cppgraphqlgen",
+  "version-semver": "3.5.0",
+  "description": "C++ GraphQL schema service generator",
+  "homepage": "https://github.com/microsoft/cppgraphqlgen",
+  "dependencies": [
+    "boost-program-options",
+    "pegtl",
+    "rapidjson"
+  ]
+}