diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json
index 8ea4e0f624d388..a53f927103cd9f 100644
--- a/ports/brpc/vcpkg.json
+++ b/ports/brpc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "brpc",
   "version": "1.16.0",
+  "port-version": 1,
   "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.",
   "homepage": "https://github.com/apache/brpc",
   "license": "Apache-2.0",
@@ -16,6 +17,7 @@
     {
       "name": "protobuf",
       "features": [
+        "libprotoc",
         "zlib"
       ]
     },
diff --git a/ports/offscale-libetcd-cpp/vcpkg.json b/ports/offscale-libetcd-cpp/vcpkg.json
index f2f2ec16cbe140..8b3d2296fca931 100644
--- a/ports/offscale-libetcd-cpp/vcpkg.json
+++ b/ports/offscale-libetcd-cpp/vcpkg.json
@@ -1,12 +1,17 @@
 {
   "name": "offscale-libetcd-cpp",
   "version-date": "2019-07-10",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A C++ client library for etcd. etcd is a distributed, reliable key-value store.",
   "homepage": "https://github.com/offscale/libetcd-cpp",
   "dependencies": [
     "grpc",
-    "protobuf",
+    {
+      "name": "protobuf",
+      "features": [
+        "libprotoc"
+      ]
+    },
     {
       "name": "vcpkg-cmake",
       "host": true
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index b1139a0007a3dd..b4ccf9fced440e 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -19,12 +19,12 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" protobuf_MSVC_STATIC_RUNTIM
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        zlib protobuf_WITH_ZLIB
+        libprotoc protobuf_BUILD_TARGET_LIBPROTOC
+        zlib      protobuf_WITH_ZLIB
 )
 
-if(VCPKG_TARGET_IS_UWP)
-    set(protobuf_BUILD_LIBPROTOC OFF)
-else()
+set(protobuf_BUILD_LIBPROTOC OFF)
+if(NOT VCPKG_TARGET_IS_UWP AND (protobuf_BUILD_PROTOC_BINARIES OR protobuf_BUILD_TARGET_LIBPROTOC))
     set(protobuf_BUILD_LIBPROTOC ON)
 endif()
 
diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json
index 72b400d7b3653f..85a3ce6f4776ca 100644
--- a/ports/protobuf/vcpkg.json
+++ b/ports/protobuf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "protobuf",
   "version": "6.33.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.",
   "homepage": "https://github.com/protocolbuffers/protobuf",
   "license": "BSD-3-Clause",
@@ -22,6 +22,10 @@
     }
   ],
   "features": {
+    "libprotoc": {
+      "description": "Build the libprotoc compiler library for target builds.",
+      "supports": "!uwp"
+    },
     "zlib": {
       "description": "ZLib based features like Gzip streams",
       "dependencies": [
diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json
index 0817e30d6c20b8..0dcf8d87bf79ff 100644
--- a/versions/b-/brpc.json
+++ b/versions/b-/brpc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8817bf2f6ff3430e3a1f633d5778c750b344d2c2",
+      "version": "1.16.0",
+      "port-version": 1
+    },
     {
       "git-tree": "9d30e0402aea62dba456d47bf1b0c66f8f948021",
       "version": "1.16.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 25466f7cb74c6f..ad3956df0a6a18 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1478,7 +1478,7 @@
     },
     "brpc": {
       "baseline": "1.16.0",
-      "port-version": 0
+      "port-version": 1
     },
     "brunocodutra-metal": {
       "baseline": "2.1.4",
@@ -7206,7 +7206,7 @@
     },
     "offscale-libetcd-cpp": {
       "baseline": "2019-07-10",
-      "port-version": 3
+      "port-version": 4
     },
     "ogre": {
       "baseline": "14.5.2",
@@ -7946,7 +7946,7 @@
     },
     "protobuf": {
       "baseline": "6.33.4",
-      "port-version": 1
+      "port-version": 2
     },
     "protobuf-c": {
       "baseline": "1.5.2",
diff --git a/versions/o-/offscale-libetcd-cpp.json b/versions/o-/offscale-libetcd-cpp.json
index bf4ad5b12d10d0..8dfd343617aad5 100644
--- a/versions/o-/offscale-libetcd-cpp.json
+++ b/versions/o-/offscale-libetcd-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "35185a82e9bc91941e9361aa0fa39e5ca2d569af",
+      "version-date": "2019-07-10",
+      "port-version": 4
+    },
     {
       "git-tree": "70eb4516cd664f01e89d2701ae45ba05ea4c9d7a",
       "version-date": "2019-07-10",
diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json
index e4bc68da4b7bbc..ca1031d7a24772 100644
--- a/versions/p-/protobuf.json
+++ b/versions/p-/protobuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ed5f5c06952c67498f580082ff1209d051222947",
+      "version": "6.33.4",
+      "port-version": 2
+    },
     {
       "git-tree": "82a850caf35034a45596845a1d6e734b82f6a79a",
       "version": "6.33.4",