diff --git a/ports/libfido2/portfile.cmake b/ports/libfido2/portfile.cmake
index 10c46976dd..9e03b73d7e 100644
--- a/ports/libfido2/portfile.cmake
+++ b/ports/libfido2/portfile.cmake
@@ -2,8 +2,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Yubico/libfido2
     REF ${VERSION}
-    SHA512 83454b0db0cc8546f377d0dd59f95785fe6b73cf28e499a6182a6ece4b7bce17c3e750155262adf71f339ec0b3b6c3d3d64a07b01c8428b4b91de97ae768f0e6
-    HEAD_REF master
+    SHA512 97932ca1a9f8d1bb3cb4b4a8d56ef70085d19ad2bd27c67944fa17ed033bfa45d28d7ad3fa318723e79b17ef5a882ac4f999ad8a6b9965c58665d99c4da7b5ee
+    HEAD_REF main
     PATCHES
         "fix_cmakelists.patch"
 )
@@ -19,10 +19,12 @@ vcpkg_cmake_configure(
         -DBUILD_STATIC_LIBS=${LIBFIDO2_BUILD_STATIC}
         -DBUILD_SHARED_LIBS=${LIBFIDO2_BUILD_SHARED}
         -DBUILD_TOOLS=OFF
+        -DBUILD_TESTS=OFF
  )
 
 vcpkg_cmake_install()
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
diff --git a/ports/libfido2/vcpkg.json b/ports/libfido2/vcpkg.json
index fcaeeacc2f..b074afc015 100644
--- a/ports/libfido2/vcpkg.json
+++ b/ports/libfido2/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libfido2",
-  "version": "1.14.0",
+  "version": "1.15.0",
   "description": "Provides library functionality to communicate with a FIDO device over USB, and to verify attestation and assertion signatures.",
   "homepage": "https://developers.yubico.com/libfido2/",
   "license": "BSD-2-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 320fa9467f..cd615d244f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4497,7 +4497,7 @@
       "port-version": 0
     },
     "libfido2": {
-      "baseline": "1.14.0",
+      "baseline": "1.15.0",
       "port-version": 0
     },
     "libflac": {
diff --git a/versions/l-/libfido2.json b/versions/l-/libfido2.json
index 923acdda71..bc85b522ad 100644
--- a/versions/l-/libfido2.json
+++ b/versions/l-/libfido2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e422fffa6ba8b16a5aff5176841f704048e5fbd1",
+      "version": "1.15.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6cdf57908524a456c4736785582dc28f1484584b",
       "version": "1.14.0",