diff --git a/ports/nanopb/fix-cmakelist.patch b/ports/nanopb/fix-cmakelist.patch
index 99bebfe57c..5482cf2af8 100644
--- a/ports/nanopb/fix-cmakelist.patch
+++ b/ports/nanopb/fix-cmakelist.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 301501d..c7e8e42 100644
+index c7e7c19..a190b71 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -16,12 +16,6 @@ option(nanopb_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON)
@@ -15,17 +15,17 @@ index 301501d..c7e8e42 100644
  if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
      set(CMAKE_DEBUG_POSTFIX "d")
  endif()
-@@ -44,7 +38,6 @@ endif()
- 
- # Determine Python module installation path
- if (NOT nanopb_PYTHON_INSTDIR_OVERRIDE)
--    find_package(Python REQUIRED COMPONENTS Interpreter)
-     file(TO_CMAKE_PATH "${Python_SITELIB}" PYTHON_INSTDIR)
- else()
-     set(PYTHON_INSTDIR ${nanopb_PYTHON_INSTDIR_OVERRIDE})
-@@ -54,6 +47,10 @@ message(STATUS "Python install dir: ${PYTHON_INSTDIR}")
- # Package nanopb generator as Python module 'nanopb'
+@@ -46,7 +40,6 @@ endif()
  if(nanopb_BUILD_GENERATOR)
+     # Determine Python module installation path
+     if (NOT nanopb_PYTHON_INSTDIR_OVERRIDE)
+-        find_package(Python REQUIRED COMPONENTS Interpreter)
+         file(TO_CMAKE_PATH "${Python_SITELIB}" PYTHON_INSTDIR)
+     else()
+         set(PYTHON_INSTDIR ${nanopb_PYTHON_INSTDIR_OVERRIDE})
+@@ -54,6 +47,10 @@ if(nanopb_BUILD_GENERATOR)
+     message(STATUS "Python install dir: ${PYTHON_INSTDIR}")
+ 
      # Copy Python code files related to the generator
 +    if(NOT EXISTS ${nanopb_PROTOC_PATH})
 +        message(FATAL_ERROR "protoc compiler not found")
diff --git a/ports/nanopb/portfile.cmake b/ports/nanopb/portfile.cmake
index 6c7a5270cb..3d9ab46dfb 100644
--- a/ports/nanopb/portfile.cmake
+++ b/ports/nanopb/portfile.cmake
@@ -1,61 +1,61 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO nanopb/nanopb
-    REF ${VERSION}
-    SHA512 1580c94d558f707c88d8d2ddf4aa3bf4ef244ddc07b13e02de7124da8d156fb30a6999bb3c54ff0497abb033e498fb85ea671774f2fb817f55fa64937f537c77
-    HEAD_REF master
-    PATCHES 
-        fix-cmakelist.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" nanopb_BUILD_STATIC_LIBS)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" nanopb_STATIC_LINKING)
-
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        generator nanopb_BUILD_GENERATOR
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        -DPython_EXECUTABLE=${PYTHON3}
-        -Dnanopb_BUILD_RUNTIME=ON
-        -DBUILD_STATIC_LIBS=${nanopb_BUILD_STATIC_LIBS}
-        -Dnanopb_MSVC_STATIC_RUNTIME=${nanopb_STATIC_LINKING}
-        "-Dnanopb_PROTOC_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
-        ${FEATURE_OPTIONS}
-        -DCMAKE_INSTALL_DATADIR=share/${PORT}
-    MAYBE_UNUSED_VARIABLES
-        Python_EXECUTABLE
-        nanopb_PROTOC_PATH
-)
-vcpkg_cmake_install()
-
-vcpkg_copy_pdbs()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
-
-if(nanopb_BUILD_GENERATOR)
-    file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/generator/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-    if(VCPKG_TARGET_IS_WINDOWS)
-        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-    else()
-        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
-    endif()
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
-
-if(nanopb_BUILD_STATIC_LIBS)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-# Handle copyright
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nanopb/nanopb
+    REF ${VERSION}
+    SHA512 7829ecd42243c194e4c00dd1722288af38630fcc85b77b83c599dc3b1e14d5c4e5b62de24dff07ca724c1f5bd623ee5a31815311823eb80791da84ee8c5ab232
+    HEAD_REF master
+    PATCHES
+        fix-cmakelist.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" nanopb_BUILD_STATIC_LIBS)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" nanopb_STATIC_LINKING)
+
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        generator nanopb_BUILD_GENERATOR
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DPython_EXECUTABLE=${PYTHON3}
+        -Dnanopb_BUILD_RUNTIME=ON
+        -DBUILD_STATIC_LIBS=${nanopb_BUILD_STATIC_LIBS}
+        -Dnanopb_MSVC_STATIC_RUNTIME=${nanopb_STATIC_LINKING}
+        "-Dnanopb_PROTOC_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+        ${FEATURE_OPTIONS}
+        -DCMAKE_INSTALL_DATADIR=share/${PORT}
+    MAYBE_UNUSED_VARIABLES
+        Python_EXECUTABLE
+        nanopb_PROTOC_PATH
+)
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
+
+if(nanopb_BUILD_GENERATOR)
+    file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/generator/" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    if(VCPKG_TARGET_IS_WINDOWS)
+        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    else()
+        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/nanopb_generator" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+        file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/protoc-gen-nanopb" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    endif()
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+
+if(nanopb_BUILD_STATIC_LIBS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+# Handle copyright
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/nanopb/vcpkg.json b/ports/nanopb/vcpkg.json
index 3e2d065d81..dacb76bb96 100644
--- a/ports/nanopb/vcpkg.json
+++ b/ports/nanopb/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nanopb",
-  "version": "0.4.9.1",
+  "version": "0.4.9.2",
   "description": "A small code-size Protocol Buffers implementation in ANSI C.",
   "homepage": "https://jpa.kapsi.fi/nanopb/",
   "license": "Zlib",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1c4117afd2..40a86b6b53 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6993,7 +6993,7 @@
       "port-version": 0
     },
     "nanopb": {
-      "baseline": "0.4.9.1",
+      "baseline": "0.4.9.2",
       "port-version": 0
     },
     "nanoprintf": {
diff --git a/versions/n-/nanopb.json b/versions/n-/nanopb.json
index fc58918e8e..4f383239c9 100644
--- a/versions/n-/nanopb.json
+++ b/versions/n-/nanopb.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a364a8b3641fac4384059146e3d53cf767590b71",
+      "version": "0.4.9.2",
+      "port-version": 0
+    },
     {
       "git-tree": "d1b06b3cb029dac845941713af21e44f2510a7db",
       "version": "0.4.9.1",