diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile
index 061430f4067a..2f58b6b06302 100644
--- a/databases/mongodb60/Makefile
+++ b/databases/mongodb60/Makefile
@@ -1,146 +1,143 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	6.0.3
+DISTVERSION=	6.0.4
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	Distributed document-oriented "NoSQL" database (6.0.x Branch)
 WWW=		https://docs.mongodb.com/v6.0/
 
 LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 IGNORE=		segmentation fault at runtime: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267668
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
 # build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 BUILD_DEPENDS+=	autoconf2.13:devel/autoconf2.13 \
 		gsed:textproc/gsed
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libcurl.so:ftp/curl \
+LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
 		libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
 		libyaml-cpp.so:devel/yaml-cpp \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++17-lang cpe python:build scons shebangfix
 # gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
 USES+=		gmake pkgconfig
 
 # mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 MOZJS_TAG=	82aac6af18abcd5bf188afbc821779ccb0ca0902
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb mongodb-forks:mozjs
 GH_PROJECT=	mongo spidermonkey:mozjs
 GH_TAGNAME=	${MOZJS_TAG}:mozjs
 USE_RC_SUBR=	mongod
 
 SHEBANG_FILES=	buildscripts/scons.py
 python_OLD_CMD=	@python_interpreter@
 
 MAKE_ARGS=	--cxx-std=17 \
 		--disable-warnings-as-errors \
 		--libc++ \
 		--runtime-hardening=on \
-		--use-system-boost \
 		--use-system-icu \
 		--use-system-libunwind \
 		--use-system-pcre \
 		--use-system-snappy \
 		--use-system-stemmer \
 		--use-system-yaml \
 		--use-system-zlib \
 		--use-system-zstd \
 		-j${MAKE_JOBS_NUMBER} \
 		AR=llvm-ar \
 		MONGO_VERSION=${DISTVERSION} \
 		VERBOSE=on
 
 CONFLICTS_INSTALL=	mongodb[0-9][0-9]
 
 USERS=		mongodb
 GROUPS=		mongodb
 
 OPTIONS_DEFINE=		LTO SASL SSL NOAVX
 OPTIONS_DEFAULT=	LTO SASL SSL
 
 NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
 
 LTO_MAKE_ARGS=	--lto=on
 
 NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USES=	ssl
 SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
 .if ${OSREL} == "12.3"
 IGNORE=		does not compile on 12.3, libc++ too old
 .endif
 
 ALL_TARGET=	install-core
 
 # This ports is only following the Major Release.
 # https://docs.mongodb.com/manual/reference/versioning/
 PORTSCOUT=	limit:^6\.0\.
 
 CPE_PRODUCT=	mongodb
 
 .if ${ARCH} == amd64
 MOZJS_ARCH=	x86_64
 .elif ${ARCH} == powerpc64le
 MOZJS_ARCH=	ppc64le
 .elif ${ARCH} == aarch64
 MOZJS_ARCH=	${ARCH}
 .endif
 
 post-patch:
-	${RM} -rf ${WRKSRC}/src/third_party/boost
 	${RM} -rf ${WRKSRC}/src/third_party/icu4c-*
 	${RM} -rf ${WRKSRC}/src/third_party/pcre-*
 	${RM} -rf ${WRKSRC}/src/third_party/snappy-*
 	${RM} -rf ${WRKSRC}/src/third_party/libstemmer_c
 	${RM} -rf ${WRKSRC}/src/third_party/unwind
 	${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp
 	${RM} -rf ${WRKSRC}/src/third_party/zlib-*
 	${RM} -rf ${WRKSRC}/src/third_party/zstandard
 
 do-configure:
 # Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
 	${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release
 	cd ${WRKSRC}/src/third_party/mozjs/mozilla-release/js/src && ${LOCALBASE}/bin/autoconf2.13
 	cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd
 
 do-build:
 	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
 
 do-install:
 .for f in mongod mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
 	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
 .endfor
 	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
 
 .include <bsd.port.post.mk>
diff --git a/databases/mongodb60/distinfo b/databases/mongodb60/distinfo
index 00139cfa525a..d53069e4dd3b 100644
--- a/databases/mongodb60/distinfo
+++ b/databases/mongodb60/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1672748600
-SHA256 (mongodb-mongo-r6.0.3_GH0.tar.gz) = 6cec3ab219a4b1a89038a03c838ee15b43e69324b8714953ea7db2342d2c1222
-SIZE (mongodb-mongo-r6.0.3_GH0.tar.gz) = 90532858
+TIMESTAMP = 1674388422
+SHA256 (mongodb-mongo-r6.0.4_GH0.tar.gz) = 0fd0d08ed62ecaea0f40f0d382202a23f8d782c7b57837f1237f47be07b3b3d2
+SIZE (mongodb-mongo-r6.0.4_GH0.tar.gz) = 90579346
 SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0
 SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901