diff --git a/ports/libspatialindex/mingw.patch b/ports/libspatialindex/mingw.patch
deleted file mode 100644
index 28c1c2904e..0000000000
--- a/ports/libspatialindex/mingw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -ur a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt	2022-07-19 15:21:35.950966519 +0200
-+++ b/src/CMakeLists.txt	2022-07-19 15:21:50.251002371 +0200
-@@ -208,7 +208,7 @@
-     PROPERTIES VERSION "${SIDX_LIB_VERSION}"
-                SOVERSION "${SIDX_LIB_SOVERSION}" )
- 
--if(WIN32)
-+if(MSVC)
-     target_compile_options(${SIDX_LIB_NAME} PRIVATE "/wd4068")
-     target_compile_options(${SIDX_C_LIB_NAME} PRIVATE "/wd4068")
- 
diff --git a/ports/libspatialindex/portfile.cmake b/ports/libspatialindex/portfile.cmake
index 5ab8185d95..cef6ecf051 100644
--- a/ports/libspatialindex/portfile.cmake
+++ b/ports/libspatialindex/portfile.cmake
@@ -1,12 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libspatialindex/libspatialindex
-    REF 1.9.3
-    SHA512 d4c608abbd631dc163b7b4fb6bf09dee3e85ce692a5f8875d51f05a26e09c75cd17dff1ed9d2c232a071f0f5864d21d877b4cbc252f3416896db24dfa3fa18cb
+    REF "${VERSION}"
+    SHA512 a508a9ed4019641bdaaa53533505531f3db440b046a9c7d9f78ed480293200c51796c2d826a6bb9b4f9543d60bb0fef9e4c885ec3f09326cfa4d2fb81c1593aa
     HEAD_REF master
-    PATCHES
-        static.patch
-        mingw.patch
 )
 
 vcpkg_cmake_configure(
@@ -18,7 +15,8 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})  
+vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
 #Debug
diff --git a/ports/libspatialindex/static.patch b/ports/libspatialindex/static.patch
deleted file mode 100644
index 1ce2b9d6a1..0000000000
--- a/ports/libspatialindex/static.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c34ee8d71..84e4a9247 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,7 +43,7 @@ SET(SIDX_VERSION_MINOR "9")
- SET(SIDX_VERSION_PATCH "3")
- SET(SIDX_LIB_VERSION "6.1.1")
- SET(SIDX_LIB_SOVERSION "6")
--SET(BUILD_SHARED_LIBS ON)
-+option(BUILD_SHARED_LIBS "Build shared libs" ON)
- 
- 
- set(SIDX_VERSION_STRING "${SIDX_VERSION_MAJOR}.${SIDX_VERSION_MINOR}.${SIDX_VERSION_PATCH}")
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 90f4501bc..aad327181 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -188,9 +188,13 @@ set(SIDX_SOURCES
- #endif()
- 
- 
--add_library(${SIDX_LIB_NAME} ${SIDX_SOURCES})
--
--add_library(${SIDX_C_LIB_NAME} ${SIDX_CAPI_CPP})
-+if(BUILD_SHARED_LIBS)
-+  add_library(${SIDX_LIB_NAME} SHARED ${SIDX_SOURCES})
-+  add_library(${SIDX_C_LIB_NAME} SHARED ${SIDX_CAPI_CPP})
-+else(BUILD_SHARED_LIBS)
-+  add_library(${SIDX_LIB_NAME} STATIC ${SIDX_SOURCES})
-+  add_library(${SIDX_C_LIB_NAME} STATIC ${SIDX_CAPI_CPP})
-+endif(BUILD_SHARED_LIBS)
- 
- target_link_libraries(${SIDX_C_LIB_NAME}
-   ${SIDX_LIB_NAME}
-@@ -208,9 +212,10 @@ if(WIN32)
-     target_compile_options(${SIDX_LIB_NAME} PRIVATE "/wd4068")
-     target_compile_options(${SIDX_C_LIB_NAME} PRIVATE "/wd4068")
- 
--    target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1")
--    target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1")
--    if (NOT WITH_STATIC_SIDX)
-+    if (BUILD_SHARED_LIBS)
-+        target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1")
-+        target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_EXPORT=1")
-+    else()
-         target_compile_definitions(${SIDX_LIB_NAME} PRIVATE "-DSIDX_DLL_IMPORT=1")
-         target_compile_definitions(${SIDX_C_LIB_NAME} PRIVATE "-DSIDX_DLL_IMPORT=1")
-     endif()
-
-diff --git a/include/spatialindex/capi/sidx_export.h b/include/spatialindex/capi/sidx_export.h
-index b6c84f1ef..7b0a39364 100644
---- a/include/spatialindex/capi/sidx_export.h
-+++ b/include/spatialindex/capi/sidx_export.h
-@@ -29,7 +29,7 @@
- #pragma once
- 
- #ifndef SIDX_C_DLL
--#if defined(_MSC_VER)
-+#if defined(_MSC_VER) && defined(SIDX_DLL_EXPORT)
- #  define SIDX_C_DLL     __declspec(dllexport)
- #  define SIDX_DLL     __declspec(dllexport)
- #else
-
-diff --git a/include/spatialindex/tools/Tools.h b/include/spatialindex/tools/Tools.h
-index 322bc819e..46b62fa00 100644
---- a/include/spatialindex/tools/Tools.h
-+++ b/include/spatialindex/tools/Tools.h
-@@ -46,7 +46,7 @@
-   #ifdef SIDX_DLL_EXPORT
-     #define SIDX_DLL __declspec(dllexport)
-   #else
--    #define SIDX_DLL __declspec(dllimport)
-+    #define SIDX_DLL
-   #endif
- 
-   // Nuke this annoying warning.  See http://www.unknownroad.com/rtfm/VisualStudio/warningC4251.html
diff --git a/ports/libspatialindex/vcpkg.json b/ports/libspatialindex/vcpkg.json
index d8180d7447..d8235a2c0e 100644
--- a/ports/libspatialindex/vcpkg.json
+++ b/ports/libspatialindex/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libspatialindex",
-  "version": "1.9.3",
-  "port-version": 3,
+  "version": "2.0.0",
   "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.",
   "homepage": "http://libspatialindex.github.com",
   "license": "MIT",
@@ -10,6 +9,10 @@
       "name": "vcpkg-cmake",
       "host": true
     },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 3cf868f729..37725166f3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5101,8 +5101,8 @@
       "port-version": 0
     },
     "libspatialindex": {
-      "baseline": "1.9.3",
-      "port-version": 3
+      "baseline": "2.0.0",
+      "port-version": 0
     },
     "libspatialite": {
       "baseline": "5.1.0",
diff --git a/versions/l-/libspatialindex.json b/versions/l-/libspatialindex.json
index a981065ef2..60e6b15fde 100644
--- a/versions/l-/libspatialindex.json
+++ b/versions/l-/libspatialindex.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "add2a4242b540d512b39c2f69746304f29ee8bdc",
+      "version": "2.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "97b36055483a86131a19e83cde29ec1fbd0e87c3",
       "version": "1.9.3",