diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake
index 86e9f97c74..6579f1deed 100644
--- a/ports/oniguruma/portfile.cmake
+++ b/ports/oniguruma/portfile.cmake
@@ -1,10 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO kkos/oniguruma
-    REF v6.9.7.1
-    SHA512 CE22050E04E51843E894D2D534D062FDD23CC2BAAC9BA43DA1843EC928F6CE5ED3D4407FE945F4D34ADADF3167DFD943CD81AE4556F7C5EC51E7331C35EAD479
+    REF "v${VERSION}"
+    SHA512 7c89247d8504c635687dc61b39b39b5afefa4851b24409a8eab31273f1cbc88f3db89095ae4b135bd034147d2616c2e18fc74887300b89532eedeab75677f437
     HEAD_REF master
-    PATCHES fix-uwp.patch
+    PATCHES 
+        fix-uwp.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -30,11 +31,15 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
-
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/debug/share"
-)
+
+vcpkg_fixup_pkgconfig()
+
+# Note that onig-config is a shell script, not CMake configs, so
+# vcpkg_cmake_config_fixup would be inappropriate
+file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/onig-config")
+if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config")
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/onig-config")
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h"
@@ -51,4 +56,10 @@ endif()
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-vcpkg_fixup_pkgconfig()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include/")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
diff --git a/ports/oniguruma/vcpkg.json b/ports/oniguruma/vcpkg.json
index 7247d3036c..a50a06aee0 100644
--- a/ports/oniguruma/vcpkg.json
+++ b/ports/oniguruma/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "oniguruma",
-  "version": "6.9.7.1",
-  "port-version": 1,
+  "version": "6.9.9",
   "description": "Modern and flexible regular expressions library",
   "homepage": "https://github.com/kkos/oniguruma",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 50feedd6fe..295e002b2e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6533,8 +6533,8 @@
       "port-version": 1
     },
     "oniguruma": {
-      "baseline": "6.9.7.1",
-      "port-version": 1
+      "baseline": "6.9.9",
+      "port-version": 0
     },
     "onnx": {
       "baseline": "1.16.2",
diff --git a/versions/o-/oniguruma.json b/versions/o-/oniguruma.json
index 32d80a4245..d9c70cdeda 100644
--- a/versions/o-/oniguruma.json
+++ b/versions/o-/oniguruma.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "40c77d00a3c02948a2c252bcb75fed36bcd1a0c5",
+      "version": "6.9.9",
+      "port-version": 0
+    },
     {
       "git-tree": "107a3e6619a149a76b52ef9c9f4dbb1b7343a456",
       "version": "6.9.7.1",