diff --git a/.gitmodules b/.gitmodules
index 8e838b6f..a0a57f3d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "vcpkg"]
 	path = vcpkg
-	url = https://github.com/bewaremypower/vcpkg.git
+	url = https://github.com/microsoft/vcpkg.git
diff --git a/pkg/mac/build-static-library.sh b/pkg/mac/build-static-library.sh
index 9524ad47..62440f4c 100755
--- a/pkg/mac/build-static-library.sh
+++ b/pkg/mac/build-static-library.sh
@@ -34,6 +34,11 @@ else
     exit 1
 fi
 
+# Use a forked version of vcpkg to support building libcurl with IPv6 disabled
+rm -rf vcpkg
+git clone https://github.com/BewareMyPower/vcpkg.git -b curl-8.4.0-osx-patch
+git apply vcpkg-osx-json.diff
+
 INSTALL_DIR=$PWD/pkg/mac/.install
 set -x
 cmake -B build-osx \
diff --git a/vcpkg b/vcpkg
index b03173a5..97dd2672 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit b03173a5d0cbd2f7c3c5e85a576e98fba3560835
+Subproject commit 97dd26728e3856ed1ab62ee74ee3a391d9c81d19
diff --git a/vcpkg-osx-json.diff b/vcpkg-osx-json.diff
new file mode 100644
index 00000000..53c453a9
--- /dev/null
+++ b/vcpkg-osx-json.diff
@@ -0,0 +1,22 @@
+diff --git a/vcpkg.json b/vcpkg.json
+index 5ff4410..e117563 100644
+--- a/vcpkg.json
++++ b/vcpkg.json
+@@ -2,7 +2,7 @@
+   "name": "pulsar-cpp",
+   "version": "3.5.0",
+   "description": "Pulsar C++ SDK",
+-  "builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad",
++  "builtin-baseline": "b03173a5d0cbd2f7c3c5e85a576e98fba3560835",
+   "dependencies": [
+     {
+       "name": "asio",
+@@ -25,7 +25,7 @@
+       "features": [
+         "openssl"
+       ],
+-      "version>=": "8.4.0"
++      "version>=": "8.4.0#1"
+     },
+     {
+       "name": "dlfcn-win32",
diff --git a/vcpkg.json b/vcpkg.json
index e117563c..5ff44100 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -2,7 +2,7 @@
   "name": "pulsar-cpp",
   "version": "3.5.0",
   "description": "Pulsar C++ SDK",
-  "builtin-baseline": "b03173a5d0cbd2f7c3c5e85a576e98fba3560835",
+  "builtin-baseline": "b051745c68faa6f65c493371d564c4eb8af34dad",
   "dependencies": [
     {
       "name": "asio",
@@ -25,7 +25,7 @@
       "features": [
         "openssl"
       ],
-      "version>=": "8.4.0#1"
+      "version>=": "8.4.0"
     },
     {
       "name": "dlfcn-win32",