diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index affa0ee..da91178 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,2 +1,2 @@
 DIST mongodb-5.0.29.tar.gz 57306690 BLAKE2B 53560d7ae00f0940d127a869603a954ed87d11bf3884de5188d058a93a14502e3d2f7abef842ef443873231cd5b9acce3a519b45a173fe540887ff35a3219dc3 SHA512 086ad9c481f314d3409b75d3231b1d3e56eb292af980f1037e4e259bea7d07d0f075f3b9c91931341a187c20fda400cd38cf6d0a527c12cd3349a6270df66d56
-DIST mongodb-6.0.17.gh.tar.gz 91534894 BLAKE2B 6fc736bc08ce73eb0d110ccda1d1824d9e33bd8b938ebfb9b9b3d646a03e2792261b3881b758e589ff9bfdf91005929698c53918e864bacc82f5d4127b594835 SHA512 4c1b38e18f1a709cc8a1d131de1c2a6d8a9092e8501b9a93fdc3b7400749cdf4855163dccc8100a30129681f6fa75a83bf41779b9556cd788dc9cbd9ed60471c
+DIST mongodb-6.0.17.tar.gz 91534894 BLAKE2B 6fc736bc08ce73eb0d110ccda1d1824d9e33bd8b938ebfb9b9b3d646a03e2792261b3881b758e589ff9bfdf91005929698c53918e864bacc82f5d4127b594835 SHA512 4c1b38e18f1a709cc8a1d131de1c2a6d8a9092e8501b9a93fdc3b7400749cdf4855163dccc8100a30129681f6fa75a83bf41779b9556cd788dc9cbd9ed60471c
diff --git a/dev-db/mongodb/mongodb-6.0.17.ebuild b/dev-db/mongodb/mongodb-6.0.17.ebuild
index 53e4851..6d1ab5f 100644
--- a/dev-db/mongodb/mongodb-6.0.17.ebuild
+++ b/dev-db/mongodb/mongodb-6.0.17.ebuild
@@ -13,7 +13,8 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs flag-o-matic llvm-r1 multiprocessing pax-utils python-any-r1 scons-utils systemd tmpfiles toolchain-funcs
+inherit check-reqs flag-o-matic llvm-r1 multiprocessing optfeature pax-utils python-any-r1 \
+		scons-utils systemd tmpfiles toolchain-funcs
 
 MY_PV=r${PV/_rc/-rc}
 MY_P=mongo-${MY_PV}
@@ -27,7 +28,7 @@ LICENSE="Apache-2.0 SSPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 -riscv"
 CPU_FLAGS="cpu_flags_x86_avx"
-IUSE="clang debug kerberos mongosh ssl +tools ${CPU_FLAGS}"
+IUSE="clang debug kerberos ssl ${CPU_FLAGS}"
 
 # https://github.com/mongodb/mongo/wiki/Test-The-Mongodb-Server
 # resmoke needs python packages not yet present in Gentoo
@@ -68,10 +69,6 @@ BDEPEND="
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	')
 "
-PDEPEND="
-	mongosh? ( app-admin/mongosh-bin )
-	tools? ( >=app-admin/mongo-tools-100 )
-"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.29-gcc-11.patch"
@@ -228,4 +225,6 @@ pkg_postinst() {
 	ewarn "Make sure to read the release notes and follow the upgrade process:"
 	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
 	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+	optfeature "MongoDB Shell" app-admin/mongosh-bin
+	optfeature "MongoDB tools (mongoimport, mongodump...)" app-admin/mongo-tools
 }