diff --git a/ports/boringssl/install-pc-files.cmake b/ports/boringssl/install-pc-files.cmake
new file mode 100644
index 00000000000000..f86652f2720165
--- /dev/null
+++ b/ports/boringssl/install-pc-files.cmake
@@ -0,0 +1,39 @@
+function(install_pc_file name pc_data)
+    # fix platform-specific details
+    if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW)
+        string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}")
+        string(REPLACE "-llibcrypt" "-lcrypto" pc_data "${pc_data}")
+        string(REPLACE "-lcrypt32" "" pc_data "${pc_data}")
+        string(REPLACE "-lws2_32" "" pc_data "${pc_data}")
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY)
+    endif()
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY)
+    endif()
+endfunction()
+
+install_pc_file(openssl [[
+Name: BoringSSL
+Description: Secure Sockets Layer and cryptography libraries and tools
+Requires: libssl libcrypto
+]])
+
+install_pc_file(libssl [[
+Name: BoringSSL-libssl
+Description: Secure Sockets Layer and cryptography libraries
+Libs: -L"${libdir}" -llibssl
+Requires: libcrypto
+Cflags: -I"${includedir}"
+]])
+
+install_pc_file(libcrypto [[
+Name: BoringSSL-libcrypto
+Description: OpenSSL cryptography library
+Libs: -L"${libdir}" -llibcrypto
+Libs.private: -lcrypt32 -lws2_32
+Cflags: -I"${includedir}"
+]])
+
+vcpkg_fixup_pkgconfig()
diff --git a/ports/boringssl/openssl.pc.in b/ports/boringssl/openssl.pc.in
new file mode 100644
index 00000000000000..3033e1804da0f4
--- /dev/null
+++ b/ports/boringssl/openssl.pc.in
@@ -0,0 +1,6 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Version: @OPENSSL_VERSION@
+@pc_data@
diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake
index be9ed1ee86478b..94c11088653eb8 100644
--- a/ports/boringssl/portfile.cmake
+++ b/ports/boringssl/portfile.cmake
@@ -41,6 +41,8 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 
+include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake")
+
 if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl)
   vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl")
 endif()
diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json
index 9d0affcbbaaa9c..40331383875fb9 100644
--- a/ports/boringssl/vcpkg.json
+++ b/ports/boringssl/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "boringssl",
   "version-date": "2021-06-23",
-  "port-version": 2,
-  "description": "BoringSSl is a fork of OpenSSL developed by Google",
+  "port-version": 3,
+  "description": "BoringSSL is a fork of OpenSSL developed by Google",
   "homepage": "https://boringssl.googlesource.com/boringssl",
   "supports": "!uwp",
   "dependencies": [
diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json
index 4f560eae8d2719..893c242e80b68b 100644
--- a/versions/b-/boringssl.json
+++ b/versions/b-/boringssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cb83700b7bf53177773421dfb803fb8478e6a72d",
+      "version-date": "2021-06-23",
+      "port-version": 3
+    },
     {
       "git-tree": "8d28c72d322cf2245e69075deef73c5edefee0b5",
       "version-date": "2021-06-23",
diff --git a/versions/baseline.json b/versions/baseline.json
index c3e03523deaeec..b73530bafc319e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1162,7 +1162,7 @@
     },
     "boringssl": {
       "baseline": "2021-06-23",
-      "port-version": 2
+      "port-version": 3
     },
     "botan": {
       "baseline": "2.19.1",