diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
index 81773174a4a4..e20edb11f9ca 100644
--- a/databases/mongodb50/Makefile
+++ b/databases/mongodb50/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	5.0.0-rc1
+DISTVERSION=	5.0.1
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
@@ -36,6 +36,17 @@ CONFLICTS_INSTALL=	mongodb36 mongodb4[024]
 OPTIONS_DEFINE=	LTO SASL SSL
 OPTIONS_DEFAULT=LTO SASL SSL
 
+#.include <bsd.port.options.mk>
+#
+#.if ${ARCH} == aarch64 && ${OSVERSION} >= 1400000
+##BUILD_DEPENDS+= llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
+##LLVM_VERSION=   ${LLVM_DEFAULT}
+##CPP=            clang-cpp${LLVM_VERSION}
+##CC=             clang${LLVM_VERSION}
+##CXX=            clang++${LLVM_VERSION}
+#CFLAGS+=	-mno-outline-atomics
+#.endif
+
 MAKE_ARGS=	--use-system-zlib \
 		--use-system-pcre \
 		--use-system-snappy \
diff --git a/databases/mongodb50/distinfo b/databases/mongodb50/distinfo
index 9c502acdda63..9d5edc8bf07a 100644
--- a/databases/mongodb50/distinfo
+++ b/databases/mongodb50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623670264
-SHA256 (mongodb-src-r5.0.0-rc1.tar.gz) = 17b4998385e82855bb6a17056ae75e1811c2784c14b6ba89706f0ad17f5279dc
-SIZE (mongodb-src-r5.0.0-rc1.tar.gz) = 54409236
+TIMESTAMP = 1626811181
+SHA256 (mongodb-src-r5.0.1.tar.gz) = 141c9a6b538e121b2d69e26b9b3e7308f24dff9c7c238190233204a2ebe39b83
+SIZE (mongodb-src-r5.0.1.tar.gz) = 54468206
diff --git a/databases/mongodb50/files/patch-SConstruct b/databases/mongodb50/files/patch-SConstruct
index 3d7a6ad73feb..c798505de87a 100644
--- a/databases/mongodb50/files/patch-SConstruct
+++ b/databases/mongodb50/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2021-04-29 23:06:52 UTC
+--- SConstruct.orig	2021-07-15 20:56:31 UTC
 +++ SConstruct
-@@ -1324,9 +1324,9 @@ if has_option('variables-help'):
+@@ -1328,9 +1328,9 @@ if has_option('variables-help'):
      print(env_vars.GenerateHelpText(env))
      Exit(0)
  
@@ -13,7 +13,7 @@
  
  if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
      env.FatalError("Cannot use non-default install actions when generating Ninja.")
-@@ -2498,7 +2498,7 @@ if env.TargetOSIs('posix'):
+@@ -2507,7 +2507,7 @@ if env.TargetOSIs('posix'):
              # If runtime hardening is requested, then build anything
              # destined for an executable with the necessary flags for PIE.
              env.AppendUnique(
@@ -22,7 +22,7 @@
                  PROGLINKFLAGS=['-pie'],
              )
  
-@@ -2675,8 +2675,12 @@ if not env.TargetOSIs('windows') and (env.ToolchainIs(
+@@ -2684,8 +2684,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
      # setting it for both C and C++ by setting both of CFLAGS and
      # CXXFLAGS.
  
@@ -36,3 +36,13 @@
          "i386"       : { "-march=" : "nocona",       "-mtune=" : "generic"                        },
          "ppc64le"    : { "-mcpu="  : "power8",       "-mtune=" : "power8", "-mcmodel=" : "medium" },
          "s390x"      : { "-march=" : "z196",         "-mtune=" : "zEC12"                          },
+@@ -4520,7 +4524,8 @@ def doConfigure(myenv):
+     myenv = conf.Finish()
+ 
+     if env['TARGET_ARCH'] == "aarch64":
+-        AddToCCFLAGSIfSupported(myenv, "-moutline-atomics")
++        # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html
++        AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics")
+ 
+     conf = Configure(myenv)
+     usdt_enabled = get_option('enable-usdt-probes')