diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index e9abe525c6..84f607db94 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -77,7 +77,7 @@ endif()
 
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-config.cmake"
     "if(protobuf_MODULE_COMPATIBLE)"
-    "if(1)"
+    "if(protobuf_MODULE_COMPATIBLE OR CMAKE_FIND_PACKAGE_NAME STREQUAL \"Protobuf\")"
 )
 if(NOT protobuf_BUILD_LIBPROTOC)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/protobuf-module.cmake"
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index fa8d039a2f..2e2de9d26f 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "protobuf",
   "version": "5.29.3",
+  "port-version": 1,
   "description": "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "license": "BSD-3-Clause",
diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake
index 48026f3cf1..496c770fac 100644
--- a/ports/sentencepiece/portfile.cmake
+++ b/ports/sentencepiece/portfile.cmake
@@ -12,7 +12,6 @@ vcpkg_from_github(
         abseil.diff
         cxxflags.diff
         linkage.diff
-        protobuf.diff
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPM_ENABLE_SHARED)
@@ -24,6 +23,7 @@ vcpkg_cmake_configure(
         -DSPM_ENABLE_TCMALLOC=OFF
         -DSPM_ABSL_PROVIDER=package
         -DSPM_PROTOBUF_PROVIDER=package
+        -DPROTOBUF_LITE_LIBRARY=protobuf::libprotobuf-lite
 )
 
 vcpkg_cmake_install()
diff --git a/ports/sentencepiece/protobuf.diff b/ports/sentencepiece/protobuf.diff
deleted file mode 100644
index df07ffe133..0000000000
--- a/ports/sentencepiece/protobuf.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6ef8aa9..d983089 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -70,12 +70,11 @@ if (SPM_PROTOBUF_PROVIDER STREQUAL "internal")
-   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../third_party/protobuf-lite)
-   include_directories(builtin_pb)
- elseif (SPM_PROTOBUF_PROVIDER STREQUAL "package")
--  find_package(Protobuf REQUIRED)
--  include_directories(${Protobuf_INCLUDE_DIRS})
-+  find_package(protobuf CONFIG REQUIRED)
-+  set(PROTOBUF_LITE_LIBRARY protobuf::libprotobuf-lite)
-   protobuf_generate_cpp(SPM_PROTO_SRCS SPM_PROTO_HDRS sentencepiece.proto)
-   protobuf_generate_cpp(SPM_MODEL_PROTO_SRCS SPM_MODEL_PROTO_HDRS sentencepiece_model.proto)
-   set(PROTOBUF_LITE_SRCS "")
--  include_directories(${PROTOBUF_INCLUDE_DIR})
-   if (MSVC)
-     add_definitions("/D_USE_EXTERNAL_PROTOBUF")
-   else()
diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json
index 52a7470666..48876037e8 100644
--- a/ports/sentencepiece/vcpkg.json
+++ b/ports/sentencepiece/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sentencepiece",
   "version": "0.2.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training",
   "homepage": "https://github.com/google/sentencepiece",
   "license": "Apache-2.0",
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index dfd33749b4..fd218a5498 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -457,7 +457,6 @@ sdformat9:x64-uwp=fail
 sdformat9:x64-windows-static-md=fail
 sdl2-mixer:arm-uwp=fail
 sdl2-net:arm-uwp=fail
-sentencepiece:x64-windows-static-md=fail
 septag-sx:arm-uwp=fail
 septag-sx:arm64-windows=fail
 septag-sx:x64-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index d4b8af6369..78fefbc3db 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7494,7 +7494,7 @@
     },
     "protobuf": {
       "baseline": "5.29.3",
-      "port-version": 0
+      "port-version": 1
     },
     "protobuf-c": {
       "baseline": "1.5.2",
@@ -8602,7 +8602,7 @@
     },
     "sentencepiece": {
       "baseline": "0.2.0",
-      "port-version": 1
+      "port-version": 2
     },
     "sentry-native": {
       "baseline": "0.9.0",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index 7f01e0bdfc..7e3649b1bc 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1020e6e87d6a63311c6ebf7f7ec5124b9bf7be74",
+      "version": "5.29.3",
+      "port-version": 1
+    },
     {
       "git-tree": "53c97b927087d1919f2a7ef6c34e4caf1a00cdf9",
       "version": "5.29.3",
diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json
index 30c3ce19ca..b58e8c964d 100644
--- a/versions/s-/sentencepiece.json
+++ b/versions/s-/sentencepiece.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c4e0d438d3d86d651ccf3ac963c546dad41a769",
+      "version": "0.2.0",
+      "port-version": 2
+    },
     {
       "git-tree": "626e5f5d9e302b9095128148ff4ccd046486c13e",
       "version": "0.2.0",