diff --git a/ports/mosquitto/0002-win64-support.patch b/ports/mosquitto/0002-win64-support.patch
deleted file mode 100644
index c140a7873c52f5..00000000000000
--- a/ports/mosquitto/0002-win64-support.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2775a3da..ddd81b04 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON)
- if (WITH_THREADING)
- 	add_definitions("-DWITH_THREADING")
- 	if (WIN32)
--		if (CMAKE_CL_64)
--			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
--		else (CMAKE_CL_64)
--			set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
--		endif (CMAKE_CL_64)
--		set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
-+		find_package(pthread REQUIRED)
- 	elseif (ANDROID)
- 		set (PTHREAD_LIBRARIES "")
- 		set (PTHREAD_INCLUDE_DIR "")
diff --git a/ports/mosquitto/0005-websocket-shared-lib-name.patch b/ports/mosquitto/0005-websocket-shared-lib-name.patch
index 4ce8a826787233..33074e9c1bb175 100644
--- a/ports/mosquitto/0005-websocket-shared-lib-name.patch
+++ b/ports/mosquitto/0005-websocket-shared-lib-name.patch
@@ -1,20 +1,20 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9380a046..f2929e19 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -194,13 +194,13 @@ 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})
- 		endif (WIN32)
- 	else (STATIC_WEBSOCKETS)
--		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
- 	endif (STATIC_WEBSOCKETS)
- endif (WITH_WEBSOCKETS)
- 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 62ce99e..61f941e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -194,13 +194,13 @@ 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})
+ 		endif (WIN32)
+ 	else (STATIC_WEBSOCKETS)
+-		set (MOSQ_LIBS ${MOSQ_LIBS} websockets)
++		set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared)
+ 	endif (STATIC_WEBSOCKETS)
+ endif (WITH_WEBSOCKETS)
+ 
diff --git a/ports/mosquitto/0006-pthreads-for-windows.patch b/ports/mosquitto/0006-pthreads-for-windows.patch
new file mode 100644
index 00000000000000..14d59946f16dcb
--- /dev/null
+++ b/ports/mosquitto/0006-pthreads-for-windows.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c55e05..adece3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,8 +68,8 @@ option(WITH_THREADING "Include client library threading support?" ON)
+ if (WITH_THREADING)
+ 	add_definitions("-DWITH_THREADING")
+ 	if (WIN32)
+-		find_package(Threads REQUIRED)
+-		set (PTHREAD_LIBRARIES Threads::Threads)
++		find_package(pthread CONFIG REQUIRED)
++		set (PTHREAD_LIBRARIES PThreads4W::PThreads4W)
+ 		set (PTHREAD_INCLUDE_DIR "")
+ 	elseif (ANDROID)
+ 		set (PTHREAD_LIBRARIES "")
diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake
index ab11f068f07d7d..f1487108e5c374 100644
--- a/ports/mosquitto/portfile.cmake
+++ b/ports/mosquitto/portfile.cmake
@@ -2,13 +2,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO eclipse/mosquitto
     HEAD_REF master
-    REF v2.0.14
-    SHA512 4b7066acd7d8ecb05fef6089997632381c34ce6631b7106afedf95b7f72d7280e45c9b2f8cce49349bf599520770ebbebb68ff71930bc44b615d177b4056a945
+    REF "v${VERSION}"
+    SHA512 667216f3e60f9916d5de200d3a205fb5a5c798564c96e44939af6c8e3af85fffa36a63eba47db009b432d14f43883dbca5b92547a458215dd269e91f6bcfb7fa
     PATCHES
-        0002-win64-support.patch
         0003-add-find_package-libwebsockets.patch
         0004-support-static-build.patch
         0005-websocket-shared-lib-name.patch
+        0006-pthreads-for-windows.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE)
diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json
index db31380700747d..d298cf9f3973e1 100644
--- a/ports/mosquitto/vcpkg.json
+++ b/ports/mosquitto/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "mosquitto",
-  "version": "2.0.14",
+  "version": "2.0.18",
   "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",
   "dependencies": [
     "c-ares",
     "libwebsockets",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4b1e934cd0a36f..80a9744dcce381 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5569,7 +5569,7 @@
       "port-version": 3
     },
     "mosquitto": {
-      "baseline": "2.0.14",
+      "baseline": "2.0.18",
       "port-version": 0
     },
     "mozjpeg": {
diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json
index b8884b9e345689..20220eac430be9 100644
--- a/versions/m-/mosquitto.json
+++ b/versions/m-/mosquitto.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6fbbe753533949d40d9ff4307bab2bb61432a117",
+      "version": "2.0.18",
+      "port-version": 0
+    },
     {
       "git-tree": "c8f2f0732c56a4cc622139bba1b7cb110dea985d",
       "version": "2.0.14",