diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
index f19d55d43d..71cedfec52 100644
--- a/ports/gmp/vcpkg.json
+++ b/ports/gmp/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "gmp",
   "version-string": "6.2.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "The GNU Multiple Precision Arithmetic Library",
   "homepage": "https://gmplib.org",
-  "supports": "windows & !(arm | arm64)",
+  "supports": "!(windows & (arm | arm64))",
   "dependencies": [
     {
       "name": "vs-yasm",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index a9ab380840..d82c67faea 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -993,6 +993,8 @@ mpir:x64-windows-static-md=skip
 mpir:arm64-windows=skip
 mpir:x64-osx=skip
 mpir:x64-linux=skip
+mpfr:x64-osx=fail
+mpfr:x64-linux=fail
 msix:x64-linux=fail
 msix:x64-osx=fail
 msix:x64-windows-static=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 12504f1e85..7f4e2ecbd1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2262,7 +2262,7 @@
     },
     "gmp": {
       "baseline": "6.2.1",
-      "port-version": 3
+      "port-version": 4
     },
     "google-cloud-cpp": {
       "baseline": "1.25.0",
diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json
index 1ba3f1ed5e..752fcb4484 100644
--- a/versions/g-/gmp.json
+++ b/versions/g-/gmp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f53fd9a3e8e462a592c3811cf6c9dd2aec0f31e1",
+      "version-string": "6.2.1",
+      "port-version": 4
+    },
     {
       "git-tree": "3b7459d7ea886b86c9c80890c0b697df9df3cce1",
       "version-string": "6.2.1",