diff --git a/dev-db/mongodb/mongodb-5.0.16.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
similarity index 92%
rename from dev-db/mongodb/mongodb-5.0.16.ebuild
rename to dev-db/mongodb/mongodb-5.0.16-r1.ebuild
index 8938e11..a9fc206 100644
--- a/dev-db/mongodb/mongodb-5.0.16.ebuild
+++ b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild
@@ -83,11 +83,12 @@ python_check_deps() {
 }
 
 pkg_pretend() {
-	# Bug 809692
+	# Bug 809692 + 890294
 	if use amd64 && ! use cpu_flags_x86_avx; then
-		eerror "MongoDB 5.0 requires use of the AVX instruction set"
-		eerror "https://docs.mongodb.com/v5.0/administration/production-notes/"
-		die "MongoDB requires AVX"
+		ewarn "MongoDB 5.0 requires use of the AVX instruction set."
+		ewarn "This ebuild will use --experimental-optimization=-sandybridge which"
+		ewarn "will result in an experimental build of MongoDB as per upstream."
+		ewarn "https://docs.mongodb.com/v5.0/administration/production-notes/"
 	fi
 
 	if [[ -n ${REPLACING_VERSIONS} ]]; then
@@ -132,6 +133,7 @@ src_configure() {
 	)
 
 	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use amd64 && ! use cpu_flags_x86_avx && scons_opts+=( --experimental-optimization=-sandybridge ) # Bug 890294
 	use debug && scons_opts+=( --dbg=on )
 	use kerberos && scons_opts+=( --use-sasl-client )
 	use lto && scons_opts+=( --lto=on )