diff --git a/devel/corrade/Makefile b/devel/corrade/Makefile
index 815f347cd220..3e92c16357a1 100644
--- a/devel/corrade/Makefile
+++ b/devel/corrade/Makefile
@@ -1,26 +1,36 @@
 PORTNAME=	corrade
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2020.06-1214
 DISTVERSIONSUFFIX=	-g3bf6057d
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++11/C++14 multiplatform utility library
 WWW=		https://magnum.graphics/corrade/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake:testing compiler:c++14-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mosra
 GH_TUPLE=	mosra:toolchains:65568a9:toolchains/toolchains
 
 CMAKE_ARGS=	-DLIB_SUFFIX:STRING=""
 
 OPTIONS_DEFINE=	TEST
 TEST_CMAKE_BOOL=	CORRADE_BUILD_TESTS
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+	@${REINPLACE_CMD} -e 's|#include <__tuple>|#include <tuple>|g' \
+		${WRKSRC}/src/Corrade/Utility/StlForwardArray.h \
+		${WRKSRC}/src/Corrade/Utility/StlForwardTuple.h
+.endif
+
+.include <bsd.port.post.mk>