diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL
deleted file mode 100644
index 590722471c..0000000000
--- a/ports/paho-mqtt/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: paho-mqtt
-Version: 1.3.8
-Homepage: https://github.com/eclipse/paho.mqtt.c
-Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things
-Build-Depends: openssl
diff --git a/ports/paho-mqtt/fix-install-path.patch b/ports/paho-mqtt/fix-install-path.patch
index 06bf396a92..68cb3b4c4b 100644
--- a/ports/paho-mqtt/fix-install-path.patch
+++ b/ports/paho-mqtt/fix-install-path.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3df385a..1ee7be0 100644
+index aa4ad05..669adde 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC)
@@ -10,11 +10,11 @@ index 3df385a..1ee7be0 100644
 -    set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt)
 +IF(1)
 +    set(CMAKE_INSTALL_DOCDIR share/paho-mqtt)
+     set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
+     set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=")
  ENDIF()
- 
- ADD_SUBDIRECTORY(src)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 20b578a..75dc833 100644
+index 0bc7194..db4a0ac 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC)
diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake
index a5215dd82e..7c7875bb2b 100644
--- a/ports/paho-mqtt/portfile.cmake
+++ b/ports/paho-mqtt/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO eclipse/paho.mqtt.c
-  REF 317fb008e1541838d1c29076d2bc5c3e4b6c4f53 # v1.3.8
-  SHA512 065d850dbcd20144e7f5534d0cac30170c7f90b1cdca90f4eaaa6b7d69056d9e1bfe951ef34aa7e1a2d3bbc193e95a1526d4dee40ea2f243f3120620b577aacb
+  REF 3b7ae6348bc917d42c04efa962e4868c09bbde9f # v1.3.9
+  SHA512 73c10b7da7aa228100511db280ae56484cb8c42b8f0cfafb2fa3f6e230b4bb1d6b3611aa9219736a0baa9d7de0baf802dd70dbf308077f1a745bd61a67a797c7
   HEAD_REF master
   PATCHES
-         remove_compiler_options.patch
-         fix-install-path.patch
-         fix-unresolvedsymbol-arm.patch
+    remove_compiler_options.patch
+    fix-install-path.patch
+    fix-unresolvedsymbol-arm.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC)
diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json
new file mode 100644
index 0000000000..186e1299ef
--- /dev/null
+++ b/ports/paho-mqtt/vcpkg.json
@@ -0,0 +1,9 @@
+{
+  "name": "paho-mqtt",
+  "version-semver": "1.3.9",
+  "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things",
+  "homepage": "https://github.com/eclipse/paho.mqtt.c",
+  "dependencies": [
+    "openssl"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 248f8756fb..1c830adeb8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4709,7 +4709,7 @@
       "port-version": 0
     },
     "paho-mqtt": {
-      "baseline": "1.3.8",
+      "baseline": "1.3.9",
       "port-version": 0
     },
     "paho-mqttpp3": {
diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json
index c441cbd9a4..91f6400606 100644
--- a/versions/p-/paho-mqtt.json
+++ b/versions/p-/paho-mqtt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b35399fddec4f6e4eb68e16308d2b1d86b0e5427",
+      "version-semver": "1.3.9",
+      "port-version": 0
+    },
     {
       "git-tree": "a8ecb2168805d1f3745453512d5f82cccd7d391a",
       "version-string": "1.3.8",