diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 158fcf7..53574df 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,2 +1,2 @@
 DIST mongodb-5.0.28.gh.tar.gz 57289502 BLAKE2B 099575fa70df6583896009dbc7fa05467c5e884eaf63e14675d37257b3132ede8060a6ca80faaebf9a24dc04e4ab05f8591099efe2d050a1f9d872962093870b SHA512 c3bc4c2884b25e338d3d348f87b9099452f8cbfed591de920635b06509370f814090963c6787f3831919bd21d7a777ae3b2c75c255d80263444549f825c4da38
-DIST mongodb-6.0.16.gh.tar.gz 91499982 BLAKE2B efc2662c82e85a5a78a0f876b31e7c6f68608bad1e18389b5b55a7e9f3914758ce9cfeea70248eec0f3d725e4403c4a6cc9711ba634268ebf5b9d47cabeb8baa SHA512 74e4a042b4585258f989e242df09718d9c718d2a60f59fb206d8204e5bc7110b4b5ed38e38960153f61b4cdc593f9568e3c89b85ae7bad1ccafc2290d831cdf6
+DIST mongodb-6.0.17.gh.tar.gz 91534894 BLAKE2B 6fc736bc08ce73eb0d110ccda1d1824d9e33bd8b938ebfb9b9b3d646a03e2792261b3881b758e589ff9bfdf91005929698c53918e864bacc82f5d4127b594835 SHA512 4c1b38e18f1a709cc8a1d131de1c2a6d8a9092e8501b9a93fdc3b7400749cdf4855163dccc8100a30129681f6fa75a83bf41779b9556cd788dc9cbd9ed60471c
diff --git a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
index 39c76ba..de4c11e 100644
--- a/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.2-boost-1.79.patch
@@ -37,8 +37,8 @@ https://bugs.gentoo.org/844235
  #include <boost/filesystem.hpp>
 +#include <boost/filesystem/fstream.hpp>
  #include <boost/filesystem/path.hpp>
- 
- #include "mongo/base/simple_string_data_comparator.h"
+ #include <pcrecpp.h>
+
 --- a/src/mongo/shell/shell_utils_extended.cpp
 +++ b/src/mongo/shell/shell_utils_extended.cpp
 @@ -37,6 +37,7 @@
diff --git a/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch b/dev-db/mongodb/files/mongodb-5.0.28-gcc-11.patch
similarity index 89%
rename from dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch
rename to dev-db/mongodb/files/mongodb-5.0.28-gcc-11.patch
index a6ff02d..a99b79b 100644
--- a/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch
+++ b/dev-db/mongodb/files/mongodb-5.0.28-gcc-11.patch
@@ -7,6 +7,6 @@ https://bugs.gentoo.org/768339
  #include <string>
  #include <vector>
 +#include <optional>
-
- #include "mongo/db/index/multikey_paths.h"
  
+ #include "mongo/db/index/multikey_paths.h"
+ #include "mongo/db/jsobj.h"
diff --git a/dev-db/mongodb/files/mongodb-6.0.16-boost-1.79.patch b/dev-db/mongodb/files/mongodb-6.0.17-boost-1.79.patch
similarity index 97%
rename from dev-db/mongodb/files/mongodb-6.0.16-boost-1.79.patch
rename to dev-db/mongodb/files/mongodb-6.0.17-boost-1.79.patch
index 78dd84c..13e8618 100644
--- a/dev-db/mongodb/files/mongodb-6.0.16-boost-1.79.patch
+++ b/dev-db/mongodb/files/mongodb-6.0.17-boost-1.79.patch
@@ -47,8 +47,8 @@ https://bugs.gentoo.org/844235
  #include <boost/filesystem.hpp>
 +#include <boost/filesystem/fstream.hpp>
  #include <boost/filesystem/path.hpp>
- 
- #include "mongo/base/simple_string_data_comparator.h"
+ #include <pcrecpp.h>
+
 --- a/src/mongo/shell/shell_utils_extended.cpp
 +++ b/src/mongo/shell/shell_utils_extended.cpp
 @@ -37,6 +37,7 @@
diff --git a/dev-db/mongodb/files/mongodb-6.0.16-boost-1.85.patch b/dev-db/mongodb/files/mongodb-6.0.17-boost-1.85.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.16-boost-1.85.patch
rename to dev-db/mongodb/files/mongodb-6.0.17-boost-1.85.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.16-gcc-12.patch b/dev-db/mongodb/files/mongodb-6.0.17-gcc-12.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.16-gcc-12.patch
rename to dev-db/mongodb/files/mongodb-6.0.17-gcc-12.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.16-gcc-13.patch b/dev-db/mongodb/files/mongodb-6.0.17-gcc-13.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.16-gcc-13.patch
rename to dev-db/mongodb/files/mongodb-6.0.17-gcc-13.patch
diff --git a/dev-db/mongodb/files/mongodb-6.0.16-sconstruct-changes.patch b/dev-db/mongodb/files/mongodb-6.0.17-sconstruct-changes.patch
similarity index 100%
rename from dev-db/mongodb/files/mongodb-6.0.16-sconstruct-changes.patch
rename to dev-db/mongodb/files/mongodb-6.0.17-sconstruct-changes.patch
diff --git a/dev-db/mongodb/mongodb-5.0.28.ebuild b/dev-db/mongodb/mongodb-5.0.28.ebuild
index fc36aa5..50bea5a 100644
--- a/dev-db/mongodb/mongodb-5.0.28.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.28.ebuild
@@ -64,7 +64,7 @@ PDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-boost.patch"
-	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-5.0.28-gcc11.patch"
 	"${FILESDIR}/${PN}-5.0.2-fix-scons.patch"
 	"${FILESDIR}/${PN}-5.0.2-no-compass.patch"
 	"${FILESDIR}/${PN}-5.0.2-skip-no-exceptions.patch"
diff --git a/dev-db/mongodb/mongodb-6.0.16.ebuild b/dev-db/mongodb/mongodb-6.0.17.ebuild
similarity index 94%
rename from dev-db/mongodb/mongodb-6.0.16.ebuild
rename to dev-db/mongodb/mongodb-6.0.17.ebuild
index d1e6a6d..553bb25 100644
--- a/dev-db/mongodb/mongodb-6.0.16.ebuild
+++ b/dev-db/mongodb/mongodb-6.0.17.ebuild
@@ -66,19 +66,18 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-5.0.28-gcc11.patch"
 	"${FILESDIR}/${PN}-5.0.2-no-compass.patch"
 	"${FILESDIR}/${PN}-5.0.2-skip-reqs-check.patch"
-	"${FILESDIR}/${PN}-6.0.16-boost-1.79.patch"
-	"${FILESDIR}/${PN}-6.0.16-sconstruct-changes.patch"
-	"${FILESDIR}/${PN}-6.0.16-gcc-12.patch"
-	"${FILESDIR}/${PN}-6.0.16-gcc-13.patch"
+	"${FILESDIR}/${PN}-6.0.17-boost-1.79.patch"
+	"${FILESDIR}/${PN}-6.0.17-sconstruct-changes.patch"
+	"${FILESDIR}/${PN}-6.0.17-gcc-12.patch"
+	"${FILESDIR}/${PN}-6.0.17-gcc-13.patch"
 	"${FILESDIR}/${PN}-4.4.10-boost-1.81.patch"
-	"${FILESDIR}/${PN}-5.0.5-boost-1.81-extra.patch"
 	"${FILESDIR}/${PN}-5.0.16-arm64-assert.patch"
 	"${FILESDIR}/${PN}-4.4.29-no-enterprise.patch"
 	"${FILESDIR}/${PN}-5.0.26-boost-1.85.patch"
-	"${FILESDIR}/${PN}-6.0.16-boost-1.85.patch"
+	"${FILESDIR}/${PN}-6.0.17-boost-1.85.patch"
 	"${FILESDIR}/${PN}-5.0.28-clang.patch"
 )
 
@@ -136,7 +135,7 @@ src_configure() {
 		VERBOSE=1
 		VARIANT_DIR=gentoo
 		MONGO_VERSION="${PV}"
-		MONGO_GIT_HASH="1bbe71e91a41b097b19d036dee47b861b3f27181"
+		MONGO_GIT_HASH="1b0ca02043c6d35d5cfdc91e21fc00a05d901539"
 
 		--cxx-std=20
 		--disable-warnings-as-errors