diff --git a/build_scripts/desktop/package.sh b/build_scripts/desktop/package.sh
index 31137d0fb1..41bd3c0b00 100755
--- a/build_scripts/desktop/package.sh
+++ b/build_scripts/desktop/package.sh
@@ -205,6 +205,7 @@ readonly deps_hidden_firebase_firestore="
 */firestore-build/*/grpc-build/${subdir}${prefix}*.${ext}
 */firestore-build/*/grpc-build/third_party/cares/*${subdir}${prefix}*.${ext}
 */firestore-build/*/grpc-build/third_party/abseil-cpp/*${subdir}${prefix}*.${ext}
+*/firestore-build/*/grpc-build/third_party/re2/*${subdir}${prefix}re2.${ext}
 "
 
 # List of C++ namespaces to be renamed, so as to not conflict with the
@@ -228,7 +229,7 @@ readonly -a rename_namespaces=(flatbuffers flexbuffers reflection ZLib bssl uWS
                                grpc_ssl_server_credentials grpc_tls_credential_reload_config
                                grpc_tls_server_authorization_check_config GrpcUdpListener leveldb
                                leveldb_filterpolicy_create_bloom leveldb_writebatch_iterate strings
-                               TlsCredentials TlsServerCredentials tsi snappy)
+                               TlsCredentials TlsServerCredentials tsi snappy re2)
 
 # String to prepend to all hidden symbols.
 readonly rename_string=f_b_
diff --git a/firestore/integration_test/CMakeLists.txt b/firestore/integration_test/CMakeLists.txt
index 99458a4235..f7742317ae 100644
--- a/firestore/integration_test/CMakeLists.txt
+++ b/firestore/integration_test/CMakeLists.txt
@@ -196,7 +196,7 @@ else()
       "-framework SystemConfiguration"
     )
   elseif(MSVC)
-    set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32)
+    set(ADDITIONAL_LIBS advapi32 ws2_32 crypt32 dbghelp bcrypt)
   else()
     set(ADDITIONAL_LIBS pthread)
   endif()
diff --git a/release_build_files/readme.md b/release_build_files/readme.md
index dd4680846b..f637148e1d 100644
--- a/release_build_files/readme.md
+++ b/release_build_files/readme.md
@@ -452,7 +452,7 @@ information):
 Firebase C++ Library | Windows SDK library dependencies
 -------------------- | -----------------------------------------------------
 Authentication       | `advapi32, ws2_32, crypt32`
-Firestore            | `advapi32, ws2_32, crypt32, rpcrt4, ole32, shell32`
+Firestore            | `advapi32, ws2_32, crypt32, rpcrt4, ole32, shell32, dbghelp, bcrypt`
 Functions            | `advapi32, ws2_32, crypt32, rpcrt4, ole32`
 Realtime Database    | `advapi32, ws2_32, crypt32, iphlpapi, psapi, userenv, shell32`
 Remote Config        | `advapi32, ws2_32, crypt32, rpcrt4, ole32`
@@ -605,8 +605,11 @@ code.
       only using AdMob, Analytics, Remote Config, or Messaging.
     - Functions: Add a new method `GetHttpsCallableFromURL`, to create callables
       with URLs other than cloudfunctions.net.
-    - Analytics (iOS): Added InitiateOnDeviceConversionMeasurementWithEmail function to facilitate the
-      [on-device conversion measurement](https://support.google.com/google-ads/answer/12119136) API.
+    - Analytics (iOS): Added InitiateOnDeviceConversionMeasurementWithEmail
+      function to facilitate the [on-device conversion
+      measurement](https://support.google.com/google-ads/answer/12119136) API.
+    - Firestore (Desktop): On Windows, you must additionally link against the
+      bcrypt and dbghelp system libraries.
 
 ### 9.0.0
 -   Changes