diff --git a/ports/cppgraphqlgen/CONTROL b/ports/cppgraphqlgen/CONTROL
index d2c09e78ba..c354edbab1 100644
--- a/ports/cppgraphqlgen/CONTROL
+++ b/ports/cppgraphqlgen/CONTROL
@@ -1,4 +1,4 @@
 Source: cppgraphqlgen
-Version: 2.1.0
-Build-Depends: pegtl, rapidjson
+Version: 3.0.0-pre
+Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson
 Description: C++ GraphQL schema service generator
diff --git a/ports/cppgraphqlgen/bigobj.patch b/ports/cppgraphqlgen/bigobj.patch
deleted file mode 100644
index 396dd58e6e..0000000000
--- a/ports/cppgraphqlgen/bigobj.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig	2019-04-11 10:26:38.546721500 -0500
-+++ CMakeLists.txt	2019-04-11 10:27:19.863951400 -0500
-@@ -34,6 +34,9 @@ add_executable(schemagen
-   GraphQLTree.cpp
-   GraphQLResponse.cpp
-   SchemaGenerator.cpp)
-+if(MSVC)
-+  set_source_files_properties(GraphQLTree.cpp PROPERTIES COMPILE_FLAGS /bigobj)
-+endif()
- target_link_libraries(schemagen PRIVATE taocpp::pegtl)
- target_include_directories(schemagen PRIVATE
-   ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/ports/cppgraphqlgen/portfile.cmake b/ports/cppgraphqlgen/portfile.cmake
index ba3d6036d1..3cd60f9a21 100644
--- a/ports/cppgraphqlgen/portfile.cmake
+++ b/ports/cppgraphqlgen/portfile.cmake
@@ -3,25 +3,25 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/cppgraphqlgen
-    REF v2.1.0
-    SHA512 6fdeade25fc5c4af18d0288b80044a94cc9dcba9eed1640ec2cce06741b874f027930761964ed72073a25e083c0cf2fb828b9cf9732099c8a4f185776b1e1b8a
+    REF 692dcca912ec7383f80bfd2d922ff4e7c1a754b7
+    SHA512 8134fba7296a3c1af14fd35bf119e7706498941bf91554bc8c832bdc806b2770759eb20af79f165ebbeb3b4bd4642e74c30ec10f23c1ccd2cb759a0ffc7646bb
     HEAD_REF master
-    PATCHES
-    bigobj.patch
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DBUILD_TESTS=OFF -DUPDATE_SAMPLES=OFF
-    OPTIONS_RELEASE -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen
-    OPTIONS_DEBUG -DCMAKE_INSTALL_CONFIGDIR=${CURRENT_PACKAGES_DIR}/debug/share/cppgraphqlgen -DCMAKE_INSTALL_TOOLSDIR=${CURRENT_PACKAGES_DIR}/debug/tools/cppgraphqlgen
+    OPTIONS -DGRAPHQL_BUILD_TESTS=OFF -DGRAPHQL_UPDATE_SAMPLES=OFF
+    OPTIONS_RELEASE -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/tools
+    OPTIONS_DEBUG -DGRAPHQL_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/debug/share -DGRAPHQL_INSTALL_TOOLS_DIR=${CURRENT_PACKAGES_DIR}/debug/tools
 )
 
 vcpkg_install_cmake()
 
 vcpkg_fixup_cmake_targets()
 
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
+
 vcpkg_copy_pdbs()
 
 configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppgraphqlgen/copyright COPYONLY)
diff --git a/ports/pegtl-2/CONTROL b/ports/pegtl-2/CONTROL
new file mode 100644
index 0000000000..fcbcd3bbaf
--- /dev/null
+++ b/ports/pegtl-2/CONTROL
@@ -0,0 +1,3 @@
+Source: pegtl-2
+Version: 2.8.0
+Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). This version maintains compatibility with C++11.
diff --git a/ports/pegtl-2/portfile.cmake b/ports/pegtl-2/portfile.cmake
new file mode 100644
index 0000000000..79d6bb97e5
--- /dev/null
+++ b/ports/pegtl-2/portfile.cmake
@@ -0,0 +1,31 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO taocpp/pegtl
+    REF 2.8.0
+    SHA512 1652b0061cd4cbd0e687855ee2e61e97d020606c54329de8769c3a3f411002323900c11eaf0da28e107c17e269025f577f9205b7500c5bbb16502687be8ee77b
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DPEGTL_BUILD_TESTS=OFF
+        -DPEGTL_BUILD_EXAMPLES=OFF
+        -DPEGTL_INSTALL_INCLUDE_DIR=include/pegtl-2
+        -DPEGTL_INSTALL_DOC_DIR=share/pegtl-2
+        -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl-2/cmake
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl-2/cmake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+# Handle copyright
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl-2/LICENSE ${CURRENT_PACKAGES_DIR}/share/pegtl-2/copyright)
+
+# Handle collision with latest pegtl
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl-2/pegtl-config.cmake ${CURRENT_PACKAGES_DIR}/share/pegtl-2/pegtl-2-config.cmake)
diff --git a/ports/pegtl/CONTROL b/ports/pegtl/CONTROL
index b890e1bc39..f7f685e0df 100644
--- a/ports/pegtl/CONTROL
+++ b/ports/pegtl/CONTROL
@@ -1,3 +1,3 @@
 Source: pegtl
-Version: 2.8.0
+Version: 3.0.0-pre
 Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).
diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake
index 1f53e73054..f12b170b5c 100644
--- a/ports/pegtl/portfile.cmake
+++ b/ports/pegtl/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO taocpp/pegtl
-    REF 2.8.0
-    SHA512 1652b0061cd4cbd0e687855ee2e61e97d020606c54329de8769c3a3f411002323900c11eaf0da28e107c17e269025f577f9205b7500c5bbb16502687be8ee77b
+    REF c5d158ffab4baa0e1c3f6d54c0684f05a2412f74
+    SHA512 efd5d36ca14c27948005cd034e72e24855f6046141c316a1d4b7186af9753fd035dab8303dc86e2f2de1b185f5fa3f5d678672892b1fc4ab69e827492a94e897
     HEAD_REF master
 )
 
@@ -13,6 +13,8 @@ vcpkg_configure_cmake(
     OPTIONS
         -DPEGTL_BUILD_TESTS=OFF
         -DPEGTL_BUILD_EXAMPLES=OFF
+        -DPEGTL_INSTALL_DOC_DIR=share/pegtl
+        -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl/cmake
 )
 
 vcpkg_install_cmake()
@@ -22,4 +24,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl/cmake)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pegtl RENAME copyright)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE ${CURRENT_PACKAGES_DIR}/share/pegtl/copyright)