diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
index 884a19ac77c837..152ac78bdb3b28 100644
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@@ -16,11 +16,17 @@ vcpkg_from_github(
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT)
 
+set(GTEST_USE_CXX17_OPTION "")
+if("cxx17" IN_LIST FEATURES)
+    set(GTEST_USE_CXX17_OPTION "-DCMAKE_CXX_STANDARD=17")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -DBUILD_GMOCK=ON
         -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT}
+        ${GTEST_USE_CXX17_OPTION}
 )
 
 vcpkg_cmake_install()
diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json
index 0728531f5f54db..daae374437482f 100644
--- a/ports/gtest/vcpkg.json
+++ b/ports/gtest/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gtest",
   "version-semver": "1.16.0",
+  "port-version": 1,
   "description": "Google Testing and Mocking Framework",
   "homepage": "https://github.com/google/googletest",
   "license": "BSD-3-Clause",
@@ -13,5 +14,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "cxx17": {
+      "description": "Enable compiler C++17."
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 606f318eeaa670..8ed22df4e702ca 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3350,7 +3350,7 @@
     },
     "gtest": {
       "baseline": "1.16.0",
-      "port-version": 0
+      "port-version": 1
     },
     "gtk": {
       "baseline": "4.16.3",
diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json
index 71f7da92e912a7..d2c3043cec19ef 100644
--- a/versions/g-/gtest.json
+++ b/versions/g-/gtest.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f97e6a042f8662fe76d3905d82ac23a129695b1",
+      "version-semver": "1.16.0",
+      "port-version": 1
+    },
     {
       "git-tree": "7448391582abd4a7d61248894ef2979c8f065813",
       "version-semver": "1.16.0",