diff --git a/ports/libmikmod/portfile.cmake b/ports/libmikmod/portfile.cmake
index 17d19c755e..3959bb463d 100644
--- a/ports/libmikmod/portfile.cmake
+++ b/ports/libmikmod/portfile.cmake
@@ -15,9 +15,8 @@ else()
     set(ENABLE_STATIC OFF)
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DENABLE_DOC=OFF
         -DENABLE_THREADS=ON
@@ -30,20 +29,20 @@ vcpkg_configure_cmake(
         -DENABLE_RAW=ON
         -DENABLE_STDOUT=ON
         -DENABLE_WAV=ON
-        -DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
+        -DOPENAL_INCLUDE_DIR="${CURRENT_INSTALLED_DIR}/include"
         -DENABLE_STATIC=${ENABLE_STATIC}
     OPTIONS_RELEASE -DENABLE_SIMD=ON
     OPTIONS_DEBUG -DENABLE_SIMD=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_fixup_pkgconfig()
diff --git a/ports/libmikmod/vcpkg.json b/ports/libmikmod/vcpkg.json
index 797bcbc032..fa13d1eb97 100644
--- a/ports/libmikmod/vcpkg.json
+++ b/ports/libmikmod/vcpkg.json
@@ -1,10 +1,16 @@
 {
   "name": "libmikmod",
-  "version-string": "3.3.11.1",
-  "port-version": 10,
+  "version": "3.3.11.1",
+  "port-version": 11,
   "description": "Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.",
   "homepage": "https://sourceforge.net/projects/mikmod/",
+  "license": "LGPL-2.1-or-later",
+  "supports": "!osx & !uwp",
   "dependencies": [
-    "openal-soft"
+    "openal-soft",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index d15e1f09c6..a705bc59fb 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -461,10 +461,6 @@ libmesh:x64-linux=skip
 # Build fails since PIC is not enabled and some configuration tests do not work properly on UWP
 libmicrodns:arm-uwp=fail
 libmicrodns:x64-uwp=fail
-libmikmod:x64-osx=fail
-libmikmod:arm64-osx=fail
-libmodman:arm-uwp=fail
-libmodman:x64-uwp=fail
 libmodman:x64-windows-static=fail
 libmodplug:arm-uwp=fail
 libmodplug:x64-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 4ef8820438..d7a24f316d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3946,7 +3946,7 @@
     },
     "libmikmod": {
       "baseline": "3.3.11.1",
-      "port-version": 10
+      "port-version": 11
     },
     "libmodbus": {
       "baseline": "3.1.6",
diff --git a/versions/l-/libmikmod.json b/versions/l-/libmikmod.json
index a1735fbbef..de3f9ad5c6 100644
--- a/versions/l-/libmikmod.json
+++ b/versions/l-/libmikmod.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "688a0ecd6fe11127c1f75e04390beea8f582860f",
+      "version": "3.3.11.1",
+      "port-version": 11
+    },
     {
       "git-tree": "ed94a83a674fb90d5884515fc763840df2ec0375",
       "version-string": "3.3.11.1",