diff --git a/databases/mongodb40-tools/Makefile b/databases/mongodb40-tools/Makefile
index 54acdf674846..8fd8d3f8973c 100644
--- a/databases/mongodb40-tools/Makefile
+++ b/databases/mongodb40-tools/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mongodb40-tools
 DISTVERSIONPREFIX=	r
-DISTVERSION=	4.0.19
+DISTVERSION=	4.0.21
 CATEGORIES=	databases
 
 MAINTAINER=	dev.ashevchuk@gmail.com
@@ -22,7 +22,7 @@ GH_PROJECT=	mongo-tools
 GO_BUILDFLAGS=	-tags "${USE_MY_TAGS}"
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
-CONFLICTS_INSTALL=	mongodb3[46] mongodb42 mongodb3[46]-tools mongodb42-tools
+CONFLICTS_INSTALL=	mongodb36-tools mongodb42-tools mongodb-tools
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
diff --git a/databases/mongodb40-tools/distinfo b/databases/mongodb40-tools/distinfo
index b3c5931aedbb..b41b52552b53 100644
--- a/databases/mongodb40-tools/distinfo
+++ b/databases/mongodb40-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593454182
-SHA256 (mongodb-mongo-tools-r4.0.19_GH0.tar.gz) = c9ef8a03998f432886f2a9f2b5a12904f5e481ea48c75ed1a2ea4cc73a188b19
-SIZE (mongodb-mongo-tools-r4.0.19_GH0.tar.gz) = 11139649
+TIMESTAMP = 1605468899
+SHA256 (mongodb-mongo-tools-r4.0.21_GH0.tar.gz) = e5774d8610be56a00295a736f172e53d40863f21a583bfb51b788066f0b262dc
+SIZE (mongodb-mongo-tools-r4.0.21_GH0.tar.gz) = 11149295