diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json
index 2e1ddc7644dc0b..aabd5655a9107e 100644
--- a/ports/mygui/vcpkg.json
+++ b/ports/mygui/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "mygui",
   "version": "3.4.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Fast, flexible and simple GUI",
   "homepage": "http://mygui.info",
+  "supports": "!uwp",
   "dependencies": [
     "freetype",
     "sdl2-image",
diff --git a/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch b/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch
new file mode 100644
index 00000000000000..897c0aac7c8314
--- /dev/null
+++ b/ports/sdl2-image/0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch
@@ -0,0 +1,12 @@
+--- a/nanosvg.h
++++ b/nanosvg.h
+@@ -2778,7 +2778,7 @@ static void nsvg__content(void* ud, const char* s)
+        if (p->styleFlag) {
+
+                int state = 0;
+-               const char* start;	
++               const char* start = 0;
+                while (*s) {
+                        char c = *s;
+                        if (nsvg__isspace(c) || c == '{') {
+
diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake
index 148412bac69ebe..4f82650cecdcf6 100644
--- a/ports/sdl2-image/portfile.cmake
+++ b/ports/sdl2-image/portfile.cmake
@@ -10,9 +10,11 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${SDL2_IMAGE_VERSION}
+    PATCHES
+        0001-sdl2-image-potentially-uninitialized_local-pointer-variable-start.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 set(USE_JPEG OFF)
 if("libjpeg-turbo" IN_LIST FEATURES)
@@ -29,9 +31,8 @@ if("libwebp" IN_LIST FEATURES)
     set(USE_WEBP ON)
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}"
         -DUSE_PNG=ON
@@ -40,14 +41,13 @@ vcpkg_configure_cmake(
         -DUSE_WEBP=${USE_WEBP}
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-image)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-image/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-image/copyright)
-
-vcpkg_copy_pdbs()
+file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json
index f81cd5c1b1ebad..a57f936726e08a 100644
--- a/ports/sdl2-image/vcpkg.json
+++ b/ports/sdl2-image/vcpkg.json
@@ -1,12 +1,20 @@
 {
   "name": "sdl2-image",
   "version-string": "2.0.5",
-  "port-version": 3,
+  "port-version": 4,
   "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV",
   "homepage": "https://www.libsdl.org/projects/SDL_image",
   "dependencies": [
     "libpng",
-    "sdl2"
+    "sdl2",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "libjpeg-turbo": {
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 4c89e8fa009da8..47bde12c62c14c 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1330,8 +1330,6 @@ sdformat9:x64-windows-static-md=fail
 sdl1:arm-uwp=fail
 sdl1:x64-uwp=fail
 sdl1:x64-osx=fail
-sdl2-image:arm-uwp=fail
-sdl2-image:x64-uwp=fail
 sdl2-mixer:arm-uwp=fail
 sdl2-mixer:x64-uwp=fail
 sdl2-net:arm-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 0d206d9cefa31e..3c30a8938aa7e5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4618,7 +4618,7 @@
     },
     "mygui": {
       "baseline": "3.4.1",
-      "port-version": 1
+      "port-version": 2
     },
     "nameof": {
       "baseline": "0.10.1",
@@ -6246,7 +6246,7 @@
     },
     "sdl2-image": {
       "baseline": "2.0.5",
-      "port-version": 3
+      "port-version": 4
     },
     "sdl2-mixer": {
       "baseline": "2.0.4",
diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json
index c575698b9323c5..d7b1309f58ae81 100644
--- a/versions/m-/mygui.json
+++ b/versions/m-/mygui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162",
+      "version": "3.4.1",
+      "port-version": 2
+    },
     {
       "git-tree": "d06b2f348d834355086a927f9aabdd47d271819b",
       "version": "3.4.1",
diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json
index 9c30ac3ec88869..9e0ed9100fcdd1 100644
--- a/versions/s-/sdl2-image.json
+++ b/versions/s-/sdl2-image.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9042c449fc4c728c5b428332e09bc6d21a2acf34",
+      "version-string": "2.0.5",
+      "port-version": 4
+    },
     {
       "git-tree": "7cd6ce4e9108671f3f4bad86c37ee2586acbf440",
       "version-string": "2.0.5",