diff --git a/ports/rxspencer/CONTROL b/ports/rxspencer/CONTROL
deleted file mode 100644
index c310d2c890f7a7..00000000000000
--- a/ports/rxspencer/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: rxspencer
-Version: 2020-01-12
-Homepage: https://garyhouston.github.io/regex/
-Description: Henry Spencer's BSD regular expression library.
diff --git a/ports/rxspencer/portfile.cmake b/ports/rxspencer/portfile.cmake
index fea3e68cb10332..92e4fd31f06530 100644
--- a/ports/rxspencer/portfile.cmake
+++ b/ports/rxspencer/portfile.cmake
@@ -3,26 +3,29 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO garyhouston/rxspencer
-    REF e42b6a667f1385aedf49b533b9fbba58e5a26934
-    SHA512 2842e1c78c3ebbbd03d15fb85e55f861740bb446aa57157f3fc90876d931d9f865242f5eaefc94f31c8d78e0d531a008d4c579e9b4f9c7179f5c7a95a98359fd
+    REF 9f835b523f1af617ca54e06863a1924c23f6e56a #v3.9.0
+    SHA512 fe7721bd4b4e4f7d31fd5a7e42d34d0c9735d062d8b146ee47a25f87c809eead7133265fc37fa958c37bc4ffeaf101d143202080508d98efd160b8fd0a278598
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer
+    OPTIONS 
+        -DCMAKE_CONFIG_DEST=share/rxspencer
+        -Drxshared=${BUILD_SHARED}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/rxspencer")
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/rxspencer")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/regex)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/regex")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/rxspencer/vcpkg.json b/ports/rxspencer/vcpkg.json
new file mode 100644
index 00000000000000..a4fef35bebbabf
--- /dev/null
+++ b/ports/rxspencer/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "rxspencer",
+  "version": "3.9.0",
+  "description": "Henry Spencer's BSD regular expression library.",
+  "homepage": "https://garyhouston.github.io/regex/",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 24f685e1c1e49e..69f62f543cb0cc 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1384,8 +1384,6 @@ rtlsdr:x64-linux=fail
 rtlsdr:x64-osx=fail
 rttr:arm-uwp=fail
 rttr:x64-uwp=fail
-rxspencer:x64-uwp=fail
-rxspencer:arm-uwp=fail
 ryml:x64-osx=fail
 ryu:arm-uwp=fail
 ryu:x64-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 4652e933959066..c61983dd57a2b4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5617,7 +5617,7 @@
       "port-version": 0
     },
     "rxspencer": {
-      "baseline": "2020-01-12",
+      "baseline": "3.9.0",
       "port-version": 0
     },
     "ryml": {
diff --git a/versions/r-/rxspencer.json b/versions/r-/rxspencer.json
index 161dc088327574..9a23c4747d5635 100644
--- a/versions/r-/rxspencer.json
+++ b/versions/r-/rxspencer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3b5bac6d89f6ae425bfe95a4309e72146f944dd",
+      "version": "3.9.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a58f09c2e2ebb27d9b40527922b98612dd7e2de1",
       "version-string": "2020-01-12",