diff --git a/ports/flatbuffers/fix-uwp-build.patch b/ports/flatbuffers/fix-uwp-build.patch
index 44513b9e8ba..d1846547fe7 100644
--- a/ports/flatbuffers/fix-uwp-build.patch
+++ b/ports/flatbuffers/fix-uwp-build.patch
@@ -1,8 +1,8 @@
 diff --git a/src/util.cpp b/src/util.cpp
-index 3670a019..fb5d884f 100644
+index aabc23a..06e9ebe 100644
 --- a/src/util.cpp
 +++ b/src/util.cpp
-@@ -255,9 +255,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
+@@ -420,9 +420,15 @@ bool ReadEnvironmentVariable(const char *var_name, std::string *_value) {
  #ifdef _MSC_VER
    __pragma(warning(disable : 4996));  // _CRT_SECURE_NO_WARNINGS
  #endif
diff --git a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch b/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
deleted file mode 100644
index 8bd99db3661..00000000000
--- a/ports/flatbuffers/ignore_use_of_cmake_toolchain_file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec782239..f163b64d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -216,7 +216,7 @@ set(FlatBuffers_GRPCTest_SRCS
- # source_group(Compiler FILES ${FlatBuffers_Compiler_SRCS})
- # source_group(Tests FILES ${FlatBuffers_Tests_SRCS})
- 
--if(EXISTS "${CMAKE_TOOLCHAIN_FILE}")
-+if(EXISTS "${CMAKE_TOOLCHAIN_FILE}" AND NOT DEFINED VCPKG_TOOLCHAIN)
-   # do not apply any global settings if the toolchain
-   # is being configured externally
-   message(STATUS "Using toolchain file: ${CMAKE_TOOLCHAIN_FILE}.")
diff --git a/ports/flatbuffers/no-werror.patch b/ports/flatbuffers/no-werror.patch
deleted file mode 100644
index dcc5cde4118..00000000000
--- a/ports/flatbuffers/no-werror.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec782239..57566c5a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -233,13 +233,17 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
-       "${CMAKE_CXX_FLAGS} -std=c++0x")
-   endif(CYGWIN)
-   set(CMAKE_CXX_FLAGS
--    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Werror -Wextra -Werror=shadow")
-+    "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Werror=shadow")
-   set(FLATBUFFERS_PRIVATE_CXX_FLAGS "-Wold-style-cast")
-   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.4)
-     if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
-       set(CMAKE_CXX_FLAGS
-         "${CMAKE_CXX_FLAGS} -faligned-new -Werror=implicit-fallthrough=2")
-     endif()
-+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
-+      set(CMAKE_CXX_FLAGS
-+        "${CMAKE_CXX_FLAGS} -Wextra")
-+    endif()
-     set(CMAKE_CXX_FLAGS
-       "${CMAKE_CXX_FLAGS} -Wunused-result -Werror=unused-result -Wunused-parameter -Werror=unused-parameter")
-   endif()
diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake
index ce824f022a1..0a4cc3de409 100644
--- a/ports/flatbuffers/portfile.cmake
+++ b/ports/flatbuffers/portfile.cmake
@@ -3,12 +3,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/flatbuffers
-    REF v2.0.6
-    SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
+    REF 203241ed3275625c8a25c4a1e7b86e3c0289c488 #v22.10.26
+    SHA512 b2c889aa97d039f0044133daea6c68361ab4d4bb80bd6c67d3e1f6ffd1b4175fc36a21b1ab3a75d83b0296c83d98f6e42756e01fc1193ba19a77c3e896cba212
     HEAD_REF master
     PATCHES
-        ignore_use_of_cmake_toolchain_file.patch
-        no-werror.patch
         fix-uwp-build.patch
 )
 
@@ -31,20 +29,14 @@ vcpkg_fixup_pkgconfig()
 
 file(GLOB flatc_path ${CURRENT_PACKAGES_DIR}/bin/flatc*)
 if(flatc_path)
-    make_directory("${CURRENT_PACKAGES_DIR}/tools/flatbuffers")
-    get_filename_component(flatc_executable ${flatc_path} NAME)
-    file(
-        RENAME
-        ${flatc_path}
-        ${CURRENT_PACKAGES_DIR}/tools/flatbuffers/${flatc_executable}
-    )
-    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/flatbuffers")
+    vcpkg_copy_tools(TOOL_NAMES flatc AUTO_CLEAN)
 else()
-    file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/FlatbuffersConfig.cmake"
+    file(APPEND "${CURRENT_PACKAGES_DIR}/share/flatbuffers/Flatbuffers-config.cmake"
 "include(\"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/share/flatbuffers/FlatcTargets.cmake\")\n")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 
 # Handle copyright
diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json
index 5a5545748a6..195b61f8e69 100644
--- a/ports/flatbuffers/vcpkg.json
+++ b/ports/flatbuffers/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "flatbuffers",
-  "version": "2.0.6",
+  "version": "22.10.26",
   "description": [
     "Memory Efficient Serialization Library",
     "FlatBuffers is an efficient cross platform serialization library for games and other memory constrained apps. It allows you to directly access serialized data without unpacking/parsing it first, while still having great forwards/backwards compatibility."
diff --git a/versions/baseline.json b/versions/baseline.json
index c8efe448430..99c7f872849 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2341,7 +2341,7 @@
       "port-version": 0
     },
     "flatbuffers": {
-      "baseline": "2.0.6",
+      "baseline": "22.10.26",
       "port-version": 0
     },
     "flecs": {
diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json
index 0f2e1a5d77f..135e7d8bce6 100644
--- a/versions/f-/flatbuffers.json
+++ b/versions/f-/flatbuffers.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "10986755c27e0640b243331ef23716d3dcbdcba9",
+      "version": "22.10.26",
+      "port-version": 0
+    },
     {
       "git-tree": "288dddf9e3a03a41f09b5f61547bf8d6b7b888c3",
       "version": "2.0.6",