diff --git a/ports/geos/pc-file-for-msvc.patch b/ports/geos/pc-file-for-msvc.patch
new file mode 100644
index 0000000000..ad79be0720
--- /dev/null
+++ b/ports/geos/pc-file-for-msvc.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index d9267e8..26713f9 100644
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -36,6 +36,10 @@ if(NOT MSVC)
+       OWNER_READ OWNER_EXECUTE
+       GROUP_READ GROUP_EXECUTE
+       WORLD_READ WORLD_EXECUTE)
++else()
++  set(cxx_libs "")
++endif()
++if(1)
+ 
+   # pkg-config support
+   configure_file(
diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake
index 017db49533..fe8f8b0a58 100644
--- a/ports/geos/portfile.cmake
+++ b/ports/geos/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
         dont-build-docs.patch
         dont-build-astyle.patch
         pc-file-libs-private.patch
+        pc-file-for-msvc.patch
         make-geos-config-relocatable.patch
         fix-static-deps.patch
 )
@@ -29,10 +30,11 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
-        -DCMAKE_DEBUG_POSTFIX=d
         -DBUILD_TESTING=OFF
         -DBUILD_BENCHMARKS=OFF
         ${_CMAKE_EXTRA_OPTIONS}
+    OPTIONS_DEBUG
+        -DCMAKE_DEBUG_POSTFIX=d # Legacy decision, hard coded in depending ports
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS)
diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json
index 0df73d3c49..851c5dcdc3 100644
--- a/ports/geos/vcpkg.json
+++ b/ports/geos/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "geos",
   "version": "3.9.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Geometry Engine Open Source",
   "homepage": "https://www.osgeo.org/projects/geos/",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index cdbb9f26c2..ccfde840cc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2354,7 +2354,7 @@
     },
     "geos": {
       "baseline": "3.9.1",
-      "port-version": 2
+      "port-version": 3
     },
     "geotrans": {
       "baseline": "3.8",
diff --git a/versions/g-/geos.json b/versions/g-/geos.json
index dbe7c058ac..0f7002ddbb 100644
--- a/versions/g-/geos.json
+++ b/versions/g-/geos.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9a0a3db2edc588598505038b452c9c7c91c1be6e",
+      "version": "3.9.1",
+      "port-version": 3
+    },
     {
       "git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5",
       "version": "3.9.1",