diff --git a/ports/liblsquic/fix-found-boringssl.patch b/ports/liblsquic/fix-found-boringssl.patch
new file mode 100644
index 00000000000..a3a632c5ef4
--- /dev/null
+++ b/ports/liblsquic/fix-found-boringssl.patch
@@ -0,0 +1,53 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d4086a..e085a83 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -120,10 +120,12 @@ IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+     SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Od")
+     #SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DFIU_ENABLE=1")
+     #SET(LIBS ${LIBS} fiu)
++    SET(LIB_NAME ssld cryptod)
+ ELSE()
+     SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -Ox")
+     # Comment out the following line to compile out debug messages:
+     #SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_LOWEST_LOG_LEVEL=LSQ_LOG_INFO")
++    SET(LIB_NAME ssl crypto)
+ ENDIF()
+ 
+ ENDIF() #MSVC
+@@ -191,7 +193,7 @@ IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR)
+ ELSE()
+ 
+ 
+-    FOREACH(LIB_NAME ssl crypto)
++    FOREACH(LIB ${LIB_NAME})
+         # If BORINGSSL_LIB is defined, try find each lib. Otherwise, user should define BORINGSSL_LIB_ssl,
+         # BORINGSSL_LIB_crypto and so on explicitly. For example, including boringssl and lsquic both via
+         # add_subdirectory:
+@@ -201,20 +203,20 @@ ELSE()
+         #   add_subdirectory(third_party/lsquic)
+         IF (DEFINED BORINGSSL_LIB)
+             IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
+-                FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
+-                    NAMES ${LIB_NAME}
++                FIND_LIBRARY(BORINGSSL_LIB_${LIB}
++                    NAMES ${LIB}
+                     PATHS ${BORINGSSL_LIB}
+                     PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo
+                     NO_DEFAULT_PATH)
+             ELSE()
+-                FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
+-                    NAMES lib${LIB_NAME}${LIB_SUFFIX}
++                FIND_LIBRARY(BORINGSSL_LIB_${LIB}
++                    NAMES lib${LI}${LIB_SUFFIX}
+                     PATHS ${BORINGSSL_LIB}
+-                    PATH_SUFFIXES ${LIB_NAME}
++                    PATH_SUFFIXES ${LIB}
+                     NO_DEFAULT_PATH)
+             ENDIF()
+         ENDIF()
+-        IF(BORINGSSL_LIB_${LIB_NAME})
++        IF(BORINGSSL_LIB_${LIB})
+             MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}")
+         ELSE()
+             MESSAGE(FATAL_ERROR "BORINGSSL_LIB_${LIB_NAME} library not found")
diff --git a/ports/liblsquic/portfile.cmake b/ports/liblsquic/portfile.cmake
index 847500e02ea..b0d18b4a505 100644
--- a/ports/liblsquic/portfile.cmake
+++ b/ports/liblsquic/portfile.cmake
@@ -9,7 +9,10 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
     REF v3.1.1
     SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee
     HEAD_REF master
-    PATCHES disable-asan.patch)
+    PATCHES 
+        disable-asan.patch
+        fix-found-boringssl.patch
+)
 
 # Submodules
 vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH
diff --git a/ports/liblsquic/vcpkg.json b/ports/liblsquic/vcpkg.json
index 09570d93629..cb122347469 100644
--- a/ports/liblsquic/vcpkg.json
+++ b/ports/liblsquic/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "liblsquic",
   "version": "3.1.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An implementation of the QUIC and HTTP/3 protocols.",
   "homepage": "https://github.com/litespeedtech/lsquic",
   "license": "MIT AND BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 185025c1579..f309b7e3e9c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4214,7 +4214,7 @@
     },
     "liblsquic": {
       "baseline": "3.1.1",
-      "port-version": 1
+      "port-version": 2
     },
     "liblzma": {
       "baseline": "5.4.1",
diff --git a/versions/l-/liblsquic.json b/versions/l-/liblsquic.json
index 0280cb1bdaf..6c114d84eaf 100644
--- a/versions/l-/liblsquic.json
+++ b/versions/l-/liblsquic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9117a86afaed60857454ba0b5a5e684fc947ba56",
+      "version": "3.1.1",
+      "port-version": 2
+    },
     {
       "git-tree": "2a2383de53efd9458419db7bd82db49b342023da",
       "version": "3.1.1",