diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile
index 6519068734dc..001a9ccc5df2 100644
--- a/devel/apitrace/Makefile
+++ b/devel/apitrace/Makefile
@@ -1,47 +1,48 @@
 PORTNAME=	apitrace
 DISTVERSION=	9.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/a17r/${GH_PROJECT}/commit/
 # use system brotli: https://github.com/apitrace/apitrace/pull/610
 PATCHFILES=	cd3486343001d6a47.patch:-p1 \
 		b0f5a220c41af013d.patch:-p1
 
 MAINTAINER=	greg@unrelenting.technology
 COMMENT=	Tools for tracing OpenGL and other graphics APIs
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 		libpng.so:graphics/png
 
 USES=		cmake compiler:c++11-lang pkgconfig python:3.5+ shebangfix xorg
 USE_GITHUB=	yes
 USE_XORG=	x11
 
 SHEBANG_FILES=	scripts/*.py
 
 OPTIONS_DEFINE=		DOCS QT5 WAFFLE
 OPTIONS_DEFAULT=	QT5 WAFFLE
 OPTIONS_SUB=		yes
 
 WAFFLE_DESC=	Use Waffle library to allow retrace on Wayland, headless etc.
 
 QT5_USES=	qt:5
 QT5_USE=	QT=core,gui,network,widgets,buildtools_build,qmake_build
 QT5_CMAKE_BOOL=	ENABLE_GUI
 
 WAFFLE_LIB_DEPENDS=	libwaffle-1.so:graphics/waffle
 WAFFLE_CMAKE_BOOL=	ENABLE_WAFFLE
 
 post-patch:
 	${REINPLACE_CMD} -e 's|__linux__|__unix__|' ${WRKSRC}/retrace/glstate_images.cpp
 
 post-install:
 	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
 
 post-install-QT5-on:
 	${INSTALL_DATA} ${FILESDIR}/qapitrace.desktop ${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/devel/apitrace/files/patch-CMakeLists.txt b/devel/apitrace/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ed25e71f8bf1
--- /dev/null
+++ b/devel/apitrace/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2021-04-07 12:23:46 UTC
++++ CMakeLists.txt
+@@ -408,6 +408,10 @@ test_big_endian (HAVE_BIGENDIAN)
+ if (HAVE_BIGENDIAN)
+     add_definitions (-DHAVE_BIGENDIAN)
+ endif ()
++# CMake 3.20 doesn't do the tests internally in TestBigEndian
++# that end up setting HAVE_STDINT_H and similar.
++include(CheckTypeSize)
++CHECK_TYPE_SIZE("unsigned short" CMAKE_SIZEOF_UNSIGNED_SHORT LANGUAGE C)
+ 
+ # Force certain components to always be built as release
+ macro (force_release_build)