diff --git a/ports/tidy-html5/fix_unsupport_func_uwp.patch b/ports/tidy-html5/fix_unsupport_func_uwp.patch
new file mode 100644
index 00000000000000..7da38b6f7dd352
--- /dev/null
+++ b/ports/tidy-html5/fix_unsupport_func_uwp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/sprtf.c b/src/sprtf.c
+index 3468ac1..1630405 100644
+--- a/src/sprtf.c
++++ b/src/sprtf.c
+@@ -387,7 +387,7 @@ static void wprt( PTSTR ps )
+ {
+    static char _s_woibuf[1024];
+    char * cp = _s_woibuf;
+-   int len = (int)lstrlen(ps);
++   int len = (int)wcslen(ps);
+    if(len) {
+       int ret = WideCharToMultiByte( CP_ACP, /* UINT CodePage, // code page */
+          0, /* DWORD dwFlags,            // performance and mapping flags */
diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake
index 504e94807b8491..298bec58341df8 100644
--- a/ports/tidy-html5/portfile.cmake
+++ b/ports/tidy-html5/portfile.cmake
@@ -8,6 +8,7 @@ vcpkg_from_github(
         disable-doc.patch
         static-vs-shared.patch
         debug-postfix.patch
+        fix_unsupport_func_uwp.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB)
@@ -19,7 +20,6 @@ vcpkg_cmake_configure(
         -DTIDY_CONSOLE_SHARED=${BUILD_SHARED_LIB}
 )
 vcpkg_cmake_install()
-vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json
index ecbe011c3c6fbc..203fd8c77a42fa 100644
--- a/ports/tidy-html5/vcpkg.json
+++ b/ports/tidy-html5/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tidy-html5",
   "version": "5.8.0",
+  "port-version": 1,
   "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
   "homepage": "https://www.html-tidy.org",
   "license": null,
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 5e4c82dc4485a0..bb60a27484ee7b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1140,8 +1140,6 @@ tensorflow-cc:x64-osx=skip
 tensorflow-cc:arm-osx=skip
 
 thorvg:arm-neon-android=fail
-tidy-html5:arm64-uwp=fail
-tidy-html5:x64-uwp=fail
 tinycthread:arm-neon-android=fail
 tinycthread:arm64-android=fail
 tinycthread:x64-android=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index bb0094af440d3f..4018eeee941165 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8490,7 +8490,7 @@
     },
     "tidy-html5": {
       "baseline": "5.8.0",
-      "port-version": 0
+      "port-version": 1
     },
     "tiff": {
       "baseline": "4.6.0",
diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json
index adbb220c80fd62..3b1e9c3b4bb876 100644
--- a/versions/t-/tidy-html5.json
+++ b/versions/t-/tidy-html5.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3ff916aaab30ac5a85e702ab9cf4e8092db79477",
+      "version": "5.8.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e16455cbec8214de37e3deb0ad41fe57323a7dd0",
       "version": "5.8.0",