diff --git a/ports/mosquitto/0003-add-find_package-libwebsockets.patch b/ports/mosquitto/0003-add-find_package-libwebsockets.patch
deleted file mode 100644
index fc61ddfd5825f0..00000000000000
--- a/ports/mosquitto/0003-add-find_package-libwebsockets.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2775a3da..ef7ce14a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,6 +55,7 @@ endif (WITH_UNIX_SOCKETS AND NOT WIN32)
- 
- option(WITH_SOCKS "Include SOCKS5 support?" ON)
- if (WITH_SOCKS)
-+	find_package(Libwebsockets CONFIG REQUIRED)
- 	add_definitions("-DWITH_SOCKS")
- endif (WITH_SOCKS)
- 
diff --git a/ports/mosquitto/0004-support-static-build.patch b/ports/mosquitto/0004-support-static-build.patch
deleted file mode 100644
index 762d1a782f56ca..00000000000000
--- a/ports/mosquitto/0004-support-static-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt
-index 7ed1743..795bccb 100644
---- a/apps/mosquitto_passwd/CMakeLists.txt
-+++ b/apps/mosquitto_passwd/CMakeLists.txt
-@@ -13,6 +13,10 @@ if (WITH_TLS)
- 		)
- 
- 
--	target_link_libraries(mosquitto_passwd OpenSSL::SSL)
-+	if(WIN32)
-+		target_link_libraries(mosquitto_passwd OpenSSL::SSL)
-+	else()
-+		target_link_libraries(mosquitto_passwd OpenSSL::SSL ws2_32 crypt32)
-+	endif()
- 	install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
- endif (WITH_TLS)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 21b6149..b218341 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -70,7 +70,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID)
- endif (UNIX AND NOT APPLE AND NOT ANDROID)
- 
- if (WIN32)
--	set (LIBRARIES ${LIBRARIES} ws2_32)
-+	set (LIBRARIES ${LIBRARIES} ws2_32 crypt32)
- endif (WIN32)
- 
- if (WITH_SRV)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d4bae7c..f529cbc 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -195,7 +195,7 @@ if (UNIX)
- endif (UNIX)
- 
- if (WIN32)
--	set (MOSQ_LIBS ${MOSQ_LIBS} ws2_32)
-+	set (MOSQ_LIBS ${MOSQ_LIBS} ws2_32 crypt32)
- endif (WIN32)
- 
- if (WITH_WEBSOCKETS)
diff --git a/ports/mosquitto/0005-websocket-shared-lib-name.patch b/ports/mosquitto/0005-websocket-shared-lib-name.patch
deleted file mode 100644
index eba54c174d2b43..00000000000000
--- a/ports/mosquitto/0005-websocket-shared-lib-name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e76cc2b..61f941e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -194,7 +194,7 @@ endif (WIN32)
- 
- if (WITH_WEBSOCKETS)
- 	if (STATIC_WEBSOCKETS)
--		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
- 		if (WIN32)
- 			set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi)
- 			link_directories(${mosquitto_SOURCE_DIR})
diff --git a/ports/mosquitto/linkage-and-export.diff b/ports/mosquitto/linkage-and-export.diff
new file mode 100644
index 00000000000000..a4ae479c035f35
--- /dev/null
+++ b/ports/mosquitto/linkage-and-export.diff
@@ -0,0 +1,147 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9e1c58d..6fa9392 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,7 @@ option(WITH_PIC "Build the static library with PIC (Position Independent Code) e
+ option(WITH_THREADING "Include client library threading support?" ON)
+ if (WITH_THREADING)
+ 	add_definitions("-DWITH_THREADING")
+-	if(WIN32)
++	if(WIN32 AND NOT MINGW)
+ 		find_package(Pthreads4W REQUIRED)
+ 	endif()
+ endif (WITH_THREADING)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 21b6149..051dffe 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -60,7 +60,7 @@ set(C_SRC
+ 	util_mosq.c util_topic.c util_mosq.h
+ 	will_mosq.c will_mosq.h)
+ 
+-set (LIBRARIES OpenSSL::SSL)
++set (LIBRARIES PRIVATE OpenSSL::SSL)
+ 
+ if (UNIX AND NOT APPLE AND NOT ANDROID)
+ 	find_library(LIBRT rt)
+@@ -90,7 +90,7 @@ set_target_properties(libmosquitto PROPERTIES
+ )
+ 
+ if (WITH_THREADING)
+-	if(WIN32)
++	if(WIN32 AND NOT MINGW)
+ 		set (LIBRARIES ${LIBRARIES} PThreads4W::PThreads4W)
+ 	else()
+ 		set(THREADS_PREFER_PTHREAD_FLAG ON)
+@@ -115,11 +115,6 @@ if(UNIX AND NOT APPLE)
+ 	)
+ endif()
+ 
+-install(TARGETS libmosquitto
+-	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-
+ if (WITH_STATIC_LIBRARIES)
+ 	add_library(libmosquitto_static STATIC ${C_SRC})
+ 	if (WITH_PIC)
+@@ -136,8 +131,28 @@ if (WITH_STATIC_LIBRARIES)
+ 	)
+ 
+ 	target_compile_definitions(libmosquitto_static PUBLIC "LIBMOSQUITTO_STATIC")
+-	install(TARGETS libmosquitto_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++
++	set(install_target libmosquitto_static)
++	set_target_properties(libmosquitto PROPERTIES EXCLUDE_FROM_ALL 1)
++else ()
++	set(install_target libmosquitto)
+ endif (WITH_STATIC_LIBRARIES)
+ 
++target_include_directories(${install_target} PUBLIC $<INSTALL_INTERFACE:include>)
++set_target_properties(${install_target} PROPERTIES EXPORT_NAME mosquitto)
++install(TARGETS ${install_target}
++	EXPORT mosquitto
++	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++)
++install(EXPORT mosquitto
++	NAMESPACE unofficial::mosquitto::
++	FILE unofficial-mosquitto-targets.cmake
++	DESTINATION "share/unofficial-mosquitto"
++)
++configure_file("${CMAKE_CURRENT_SOURCE_DIR}/unofficial-mosquitto-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mosquitto-config.cmake" @ONLY)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mosquitto-config.cmake" DESTINATION "share/unofficial-mosquitto")
++
+ install(FILES ../include/mosquitto.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ install(FILES ../include/mqtt_protocol.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
+index 882b662..5959a96 100644
+--- a/lib/cpp/CMakeLists.txt
++++ b/lib/cpp/CMakeLists.txt
+@@ -9,15 +9,11 @@ add_library(mosquittopp SHARED ${CPP_SRC})
+ set_target_properties(mosquittopp PROPERTIES
+ 	POSITION_INDEPENDENT_CODE 1
+ )
+-target_link_libraries(mosquittopp libmosquitto)
++target_link_libraries(mosquittopp PUBLIC libmosquitto)
+ set_target_properties(mosquittopp PROPERTIES
+ 	VERSION ${VERSION}
+ 	SOVERSION 1
+ )
+-install(TARGETS mosquittopp
+-	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ 
+ if (WITH_STATIC_LIBRARIES)
+ 	add_library(mosquittopp_static STATIC
+@@ -30,7 +26,7 @@ if (WITH_STATIC_LIBRARIES)
+ 		)
+ 	endif (WITH_PIC)
+ 
+-	target_link_libraries(mosquittopp_static ${LIBRARIES})
++	target_link_libraries(mosquittopp_static PUBLIC libmosquitto_static)
+ 
+ 	set_target_properties(mosquittopp_static PROPERTIES
+ 		OUTPUT_NAME mosquittopp_static
+@@ -38,7 +34,19 @@ if (WITH_STATIC_LIBRARIES)
+ 	)
+ 
+ 	target_compile_definitions(mosquittopp_static PUBLIC "LIBMOSQUITTO_STATIC")
+-	install(TARGETS mosquittopp_static ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++
++	set(install_target mosquittopp_static)
++	set_target_properties(mosquittopp PROPERTIES EXCLUDE_FROM_ALL 1)
++else ()
++	set(install_target mosquittopp)
+ endif (WITH_STATIC_LIBRARIES)
+ 
++set_target_properties(${install_target} PROPERTIES EXPORT_NAME mosquittopp)
++install(TARGETS ${install_target}
++	EXPORT mosquitto
++	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++)
++
+ install(FILES mosquittopp.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+diff --git a/libmosquitto.pc.in b/libmosquitto.pc.in
+index 101a125..0747b43 100644
+--- a/libmosquitto.pc.in
++++ b/libmosquitto.pc.in
+@@ -8,3 +8,5 @@ Description: mosquitto MQTT library (C bindings)
+ Version: @VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lmosquitto
++Libs.private: @CMAKE_THREAD_LIBS_INIT@
++Requires.private: libssl
+diff --git a/libmosquittopp.pc.in b/libmosquittopp.pc.in
+index 6070f44..4edde61 100644
+--- a/libmosquittopp.pc.in
++++ b/libmosquittopp.pc.in
+@@ -8,3 +8,4 @@ Description: mosquitto MQTT library (C++ bindings)
+ Version: @VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lmosquittopp
++Requires.private: libmosquitto
diff --git a/ports/mosquitto/mosquitto-config.cmake b/ports/mosquitto/mosquitto-config.cmake
new file mode 100644
index 00000000000000..e0f0027a4a47b2
--- /dev/null
+++ b/ports/mosquitto/mosquitto-config.cmake
@@ -0,0 +1,12 @@
+message(AUTHOR_WARNING "find_package(${PACKAGE_NAME}) is deprecated.\n${usage}")
+
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-mosquitto CONFIG)
+
+# legacy, ported from wrapper
+find_path(MOSQUITTO_INCLUDE_DIR mosquitto.h)
+set(MOSQUITTO_INCLUDE_DIRS ${MOSQUITTO_INCLUDE_DIR})
+
+# legacy, both vars included the C++ target
+set(MOSQUITTO_LIBRARIES unofficial::mosquitto::mosquittopp)
+set(MOSQUITTOPP_LIBRARIES unofficial::mosquitto::mosquittopp)
diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake
index 28eef722571e1b..59c778cb34ce9c 100644
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@@ -5,10 +5,10 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 ca8bdcb10fea751e655e2de393479b2f863287b396b13e441de46c32918229c1f80a386fdd6d0daf3b0161f640702b6d8a87f2278c9baf2150e2c533cb59e57a
     PATCHES
-        0003-add-find_package-libwebsockets.patch
-        0004-support-static-build.patch
-        0005-websocket-shared-lib-name.patch
+        linkage-and-export.diff
 )
+file(REMOVE_RECURSE "${SOURCE_PATH}/deps")
+file(COPY "${CURRENT_PORT_DIR}/unofficial-mosquitto-config.cmake" DESTINATION "${SOURCE_PATH}/lib")
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE)
 
@@ -17,8 +17,6 @@ vcpkg_cmake_configure(
     OPTIONS
         -DWITH_STATIC_LIBRARIES=${STATIC_LINKAGE}
         -DWITH_SRV=OFF
-        -DWITH_WEBSOCKETS=ON
-        -DSTATIC_WEBSOCKETS=${STATIC_LINKAGE}
         -DWITH_TLS=ON
         -DWITH_TLS_PSK=ON
         -DWITH_THREADING=ON
@@ -29,47 +27,16 @@ vcpkg_cmake_configure(
         -DWITH_APPS=OFF
         -DWITH_BROKER=OFF
         -DWITH_BUNDLED_DEPS=OFF
-    MAYBE_UNUSED_VARIABLES
-        WITH_WEBSOCKETS
-        STATIC_WEBSOCKETS
 )
-
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-
 vcpkg_fixup_pkgconfig()
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-mosquitto)
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-
-    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-    file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-    file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-
-    file(GLOB VERSIONED_LIBRARIES LIST_DIRECTORIES FALSE
-        "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*"
-        "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*"
-        "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*"
-        "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.*"
-    )
-
-    if(NOT "x${VERSIONED_LIBRARIES}x" STREQUAL "xx")
-        file(REMOVE ${VERSIONED_LIBRARIES})
-    endif()
-
-    if(NOT "x${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}x" STREQUAL "xx")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}")
-        file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}")
-    endif()
-endif()
-
-configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
-
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/mosquitto-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
diff --git a/ports/mosquitto/unofficial-mosquitto-config.cmake b/ports/mosquitto/unofficial-mosquitto-config.cmake
new file mode 100644
index 00000000000000..57c6cb2bf87c20
--- /dev/null
+++ b/ports/mosquitto/unofficial-mosquitto-config.cmake
@@ -0,0 +1,10 @@
+if("@WITH_STATIC_LIBRARIES@")
+    include(CMakeFindDependencyMacro)
+    find_dependency(OpenSSL)
+    if(WIN32 AND NOT MINGW)
+        find_dependency(Pthreads4W)
+    else()
+        find_dependency(Threads)
+    endif()
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-mosquitto-targets.cmake")
diff --git a/ports/mosquitto/usage b/ports/mosquitto/usage
index 1f4e6735c12c5e..0c64e1d2670e8a 100644
--- a/ports/mosquitto/usage
+++ b/ports/mosquitto/usage
@@ -1,5 +1,15 @@
-The package mosquitto provides CMake targets:
+mosquitto provides CMake targets:
 
-    find_package(mosquitto REQUIRED)
-    target_include_directories(main PRIVATE ${MOSQUITTO_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${MOSQUITTO_LIBRARIES})
+  find_package(unofficial-mosquitto CONFIG REQUIRED)
+  # C bindings
+  target_link_libraries(main PRIVATE unofficial::mosquitto::mosquitto)
+  # C++ bindings
+  target_link_libraries(main PRIVATE unofficial::mosquitto::mosquittopp)
+
+mosquitto provides pkg-config modules:
+
+  # mosquitto MQTT library (C bindings)
+  libmosquitto
+
+  # mosquitto MQTT library (C++ bindings)
+  libmosquittopp
diff --git a/ports/mosquitto/vcpkg-cmake-wrapper.cmake b/ports/mosquitto/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index fb7f71dc0d50cf..00000000000000
--- a/ports/mosquitto/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-include(FindPackageHandleStandardArgs)
-include(SelectLibraryConfigurations)
-
-find_path(MOSQUITTO_INCLUDE_DIR mosquitto.h)
-
-find_library(MOSQUITTO_LIBRARY_DEBUG NAMES mosquitto libmosquitto mosquitto_static libmosquitto_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
-find_library(MOSQUITTO_LIBRARY_RELEASE NAMES mosquitto libmosquitto mosquitto_static libmosquitto_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
-find_library(MOSQUITTOPP_LIBRARY_DEBUG NAMES mosquittopp libmosquittopp mosquittopp_static libmosquittopp_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED)
-find_library(MOSQUITTOPP_LIBRARY_RELEASE NAMES mosquittopp libmosquittopp mosquittopp_static libmosquittopp_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED)
-
-select_library_configurations(MOSQUITTO)
-select_library_configurations(MOSQUITTOPP)
-
-set(MOSQUITTO_INCLUDE_DIRS ${MOSQUITTO_INCLUDE_DIR})
-set(MOSQUITTO_LIBRARIES ${MOSQUITTO_LIBRARY} ${MOSQUITTOPP_LIBRARY})
diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json
index 1945bd6553e58c..b1c24ebf6a4314 100644
--- a/ports/mosquitto/vcpkg.json
+++ b/ports/mosquitto/vcpkg.json
@@ -1,19 +1,22 @@
 {
   "name": "mosquitto",
   "version": "2.0.22",
+  "port-version": 1,
   "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino",
   "homepage": "https://mosquitto.org/",
   "license": "EPL-2.0",
-  "supports": "!android",
+  "supports": "!uwp",
   "dependencies": [
-    "c-ares",
-    "libwebsockets",
     "openssl",
     "pthreads",
     "uthash",
     {
       "name": "vcpkg-cmake",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index d5f1398a16045a..8ac2a741ff9c10 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -1436,8 +1436,6 @@ moos-essential:x64-windows-static = cascade
 moos-ui:arm64-uwp = cascade
 moos-ui:x64-uwp = cascade
 moos-ui:x64-windows-static = cascade
-mosquitto:arm64-uwp = cascade
-mosquitto:x64-uwp = cascade
 mpi:arm64-windows = cascade
 mpi:x86-windows = cascade
 msix:arm64-uwp = cascade
diff --git a/versions/baseline.json b/versions/baseline.json
index 952126dde9c987..54408868872986 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6374,7 +6374,7 @@
     },
     "mosquitto": {
       "baseline": "2.0.22",
-      "port-version": 0
+      "port-version": 1
     },
     "mozjpeg": {
       "baseline": "4.1.5",
diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json
index 2847e3fc30108b..95857efb2cf2de 100644
--- a/versions/m-/mosquitto.json
+++ b/versions/m-/mosquitto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "943296ffe7bbf60e2c16d0217184226f8993ebd7",
+      "version": "2.0.22",
+      "port-version": 1
+    },
     {
       "git-tree": "8fd367c63c64ada7084fd5f7009811a4dc84b901",
       "version": "2.0.22",