diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile
index 001a9ccc5df2..880543472582 100644
--- a/devel/apitrace/Makefile
+++ b/devel/apitrace/Makefile
@@ -1,48 +1,50 @@
 PORTNAME=	apitrace
 DISTVERSION=	9.0
-PORTREVISION=	1
+PORTREVISION=	2
 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
+# detect RTLD_DEEPBIND: https://github.com/apitrace/apitrace/pull/571
+PATCHFILES+=	2d31d49eac9bcc010.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/distinfo b/devel/apitrace/distinfo
index 8a5aa4abbee2..7047417ff067 100644
--- a/devel/apitrace/distinfo
+++ b/devel/apitrace/distinfo
@@ -1,7 +1,9 @@
 TIMESTAMP = 1577315225
 SHA256 (apitrace-apitrace-9.0_GH0.tar.gz) = 0eec81ba7d3799622336319785465a2982a0621898842517a07894d7e2aa18eb
 SIZE (apitrace-apitrace-9.0_GH0.tar.gz) = 3623693
 SHA256 (cd3486343001d6a47.patch) = 2cb56f451791f2155aa5f5f12aa19eb92cb44dd00ca51ca9a5f0d5645ca6eb77
 SIZE (cd3486343001d6a47.patch) = 1840
 SHA256 (b0f5a220c41af013d.patch) = e2f46c862d97ff45b57fed043342b8875b310c5d6bb6d7d7f7122bb2f1ac5bb0
 SIZE (b0f5a220c41af013d.patch) = 2866
+SHA256 (2d31d49eac9bcc010.patch) = 315733330ab80a19b5565a439bdac8c62a80605302db03721e05c93e6ce9db52
+SIZE (2d31d49eac9bcc010.patch) = 633
diff --git a/devel/apitrace/files/patch-dispatch_glproc__egl.cpp b/devel/apitrace/files/patch-dispatch_glproc__egl.cpp
deleted file mode 100644
index 8ac21a1e15de..000000000000
--- a/devel/apitrace/files/patch-dispatch_glproc__egl.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- dispatch/glproc_egl.cpp.orig	2019-11-26 14:27:11 UTC
-+++ dispatch/glproc_egl.cpp
-@@ -93,7 +93,7 @@ _getPublicProcAddress(const char *procName)
-     if (procName[0] == 'e' && procName[1] == 'g' && procName[2] == 'l') {
-         static void *libEGL = NULL;
-         if (!libEGL) {
--            libEGL = _dlopen("libEGL.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
-+            libEGL = _dlopen("libEGL.so", RTLD_LOCAL | RTLD_LAZY);
-             if (!libEGL) {
-                 return NULL;
-             }
-@@ -136,7 +136,7 @@ _getPublicProcAddress(const char *procName)
- 
-         static void *libGLESv2 = NULL;
-         if (!libGLESv2) {
--            libGLESv2 = _dlopen("libGLESv2.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
-+            libGLESv2 = _dlopen("libGLESv2.so", RTLD_LOCAL | RTLD_LAZY);
-         }
-         if (libGLESv2) {
-             proc = dlsym(libGLESv2, procName);
-@@ -147,7 +147,7 @@ _getPublicProcAddress(const char *procName)
- 
-         static void *libGLESv1 = NULL;
-         if (!libGLESv1) {
--            libGLESv1 = _dlopen("libGLESv1_CM.so", RTLD_LOCAL | RTLD_LAZY | RTLD_DEEPBIND);
-+            libGLESv1 = _dlopen("libGLESv1_CM.so", RTLD_LOCAL | RTLD_LAZY);
-         }
-         if (libGLESv1) {
-             proc = dlsym(libGLESv1, procName);
diff --git a/devel/apitrace/files/patch-dispatch_glproc__gl.cpp b/devel/apitrace/files/patch-dispatch_glproc__gl.cpp
deleted file mode 100644
index 412f68061b50..000000000000
--- a/devel/apitrace/files/patch-dispatch_glproc__gl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- dispatch/glproc_gl.cpp.orig	2017-10-13 17:18:18 UTC
-+++ dispatch/glproc_gl.cpp
-@@ -200,7 +200,7 @@ void * _libgl_sym(const char *symbol)
-          * exposes symbols to it.
-          */
- 
--        _libGlHandle = _dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY | RTLD_DEEPBIND);
-+        _libGlHandle = _dlopen(libgl_filename, RTLD_GLOBAL | RTLD_LAZY);
-         if (!_libGlHandle) {
-             os::log("apitrace: error: couldn't find libGL.so\n");
-             return NULL;