diff --git a/config.m4 b/config.m4
index c634707fc..9616a165e 100644
--- a/config.m4
+++ b/config.m4
@@ -270,7 +270,7 @@ if test "$PHP_MONGODB" != "no"; then
   PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None"
 
   if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then
-    PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.25.2], [
+    PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.25.4], [
       PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
       PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
 
@@ -278,10 +278,10 @@ if test "$PHP_MONGODB" != "no"; then
       PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD)
       AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
     ],[
-      AC_MSG_ERROR([Could not find system library for libbson >= 1.25.2])
+      AC_MSG_ERROR([Could not find system library for libbson >= 1.25.4])
     ])
 
-    PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.25.2], [
+    PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.25.4], [
       PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion`
       PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)"
 
@@ -289,11 +289,11 @@ if test "$PHP_MONGODB" != "no"; then
       PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD)
       AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
     ],[
-      AC_MSG_ERROR(Could not find system library for libmongoc >= 1.25.2)
+      AC_MSG_ERROR(Could not find system library for libmongoc >= 1.25.4)
     ])
 
     if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then
-      PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.8.2], [
+      PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.8.4], [
         PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
         PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)"
 
@@ -301,7 +301,7 @@ if test "$PHP_MONGODB" != "no"; then
         PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD)
         AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt])
       ],[
-        AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.8.2)
+        AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.8.4)
       ])
     fi
   fi
diff --git a/src/LIBMONGOCRYPT_VERSION_CURRENT b/src/LIBMONGOCRYPT_VERSION_CURRENT
index 53adb84c8..bfa363e76 100644
--- a/src/LIBMONGOCRYPT_VERSION_CURRENT
+++ b/src/LIBMONGOCRYPT_VERSION_CURRENT
@@ -1 +1 @@
-1.8.2
+1.8.4
diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT
index 61b813d5e..26a9e99b3 100644
--- a/src/LIBMONGOC_VERSION_CURRENT
+++ b/src/LIBMONGOC_VERSION_CURRENT
@@ -1 +1 @@
-1.25.2
+1.25.4
diff --git a/src/libmongoc b/src/libmongoc
index 3fa62f352..517838e8a 160000
--- a/src/libmongoc
+++ b/src/libmongoc
@@ -1 +1 @@
-Subproject commit 3fa62f35243445c9dbca283f762712a38a705dc5
+Subproject commit 517838e8aa87be5bfcaf7debb1b134dbc3574568
diff --git a/src/libmongocrypt b/src/libmongocrypt
index 40cc4eea4..8354ba537 160000
--- a/src/libmongocrypt
+++ b/src/libmongocrypt
@@ -1 +1 @@
-Subproject commit 40cc4eea42028e5cdf907b996d36aa2187c08441
+Subproject commit 8354ba537d11494cb0dee21ec6d32fe8ab548c52