diff --git a/devel/mdb/Makefile b/devel/mdb/Makefile
index 25764650c01a..031e389d6316 100644
--- a/devel/mdb/Makefile
+++ b/devel/mdb/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	mdb
-PORTVERSION=	20210125
-PORTREVISION=	1
+PORTVERSION=	20210810
 CATEGORIES=	devel
 
 MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	Solaris Modular Debugger
 
 LICENSE=	CDDL
 
 USES=		compiler uidfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsdjhb
 GH_PROJECT=	illumos-gate
-GH_TAGNAME=	60ff9f11c2
+GH_TAGNAME=	df212e0857
 
 ONLY_FOR_ARCHS=	amd64
 
 MAKE_ARGS=	WITH_CTF=yes
 MAKE_ARGS+=	BINDIR=${PREFIX}/bin
 MAKE_ARGS+=	LIBDIR=${PREFIX}/lib
 MAKE_ARGS+=	FREEBSD_SRC_DIR=${SRC_BASE}
 MAKE_ARGS+=	STRIP=
 WRKSRC_SUBDIR=	freebsd/cddl/usr.bin/mdb
 CFLAGS+=	-DMDB_PREFIX=\\\"${PREFIX}\\\" -g
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${SRC_BASE}/cddl/compat) || !exists(${SRC_BASE}/sys/cddl/compat)
 IGNORE=		requires full source tree with CDDL sources
 .endif
 
 .if ${OSVERSION} < 1300015 && ${COMPILER_TYPE} == "clang" && \
     ${COMPILER_VERSION} >= 80
 # clang 8 cannot compile due to enum redefinitions in kernel.h
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang70:devel/llvm70
 CPP=	${LOCALBASE}/bin/clang-cpp70
 CC=	${LOCALBASE}/bin/clang70
 CXX=	${LOCALBASE}/bin/clang++70
 .endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/mdb/kvm/${MACHINE_ARCH}
 
 .include <bsd.port.post.mk>
diff --git a/devel/mdb/distinfo b/devel/mdb/distinfo
index 3f34ab2cfd3c..de8aea11ad2b 100644
--- a/devel/mdb/distinfo
+++ b/devel/mdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611606942
-SHA256 (bsdjhb-illumos-gate-20210125-60ff9f11c2_GH0.tar.gz) = ac9419140ff4068b664d51ce648fec0ee007ea6fad9ccfa3a3d29de1fcd96d98
-SIZE (bsdjhb-illumos-gate-20210125-60ff9f11c2_GH0.tar.gz) = 115110163
+TIMESTAMP = 1628630438
+SHA256 (bsdjhb-illumos-gate-20210810-df212e0857_GH0.tar.gz) = 3daaeefbb7d44215672069868244ed46003c67db96d40858a3d85aa85d5ecffd
+SIZE (bsdjhb-illumos-gate-20210810-df212e0857_GH0.tar.gz) = 115100615
diff --git a/devel/mdb/files/patch-mdb_Makefile b/devel/mdb/files/patch-mdb_Makefile
deleted file mode 100644
index 2258d0c3ba9b..000000000000
--- a/devel/mdb/files/patch-mdb_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- mdb/Makefile.orig	2021-01-25 20:32:57 UTC
-+++ mdb/Makefile
-@@ -201,7 +201,7 @@ CWARNFLAGS.clang+= \
- 	-Wno-shadow \
- 	-Wno-sign-compare \
- 	-Wno-strict-prototypes \
--	-Wno-error-tautological-pointer-compare \
-+	-Wno-error=tautological-pointer-compare \
- 	-Wno-unused-parameter
- 
- .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 100000 || \