diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index a7b5bfb1b548..5adad7d69557 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=	libxcb
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://xcb.freedesktop.org/dist/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	The X protocol C-language Binding (XCB) library
 WWW=		https://xcb.freedesktop.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xcb-proto>=1.9:x11/xcb-proto \
-		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
+BUILD_DEPENDS=	xcb-proto>=1.9:x11/xcb-proto
 
 CONFIGURE_ARGS=	--disable-devel-docs --without-doxygen --enable-xinput --enable-xkb
 
 USES=		cpe python:build tar:xz xorg xorg-cat:lib
 USE_XORG=	xau xdmcp
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	x
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/x11/libxcb/files/patch-configure b/x11/libxcb/files/patch-configure
new file mode 100644
index 000000000000..681136eb0a7e
--- /dev/null
+++ b/x11/libxcb/files/patch-configure
@@ -0,0 +1,13 @@
+https://gitlab.freedesktop.org/xorg/lib/libxcb/-/commit/fd04ab24a5e9
+
+--- configure.orig	2022-05-03 22:15:58 UTC
++++ configure
+@@ -20662,7 +20662,7 @@ case $host_os in
+ fi
+ NEEDED="xau >= 0.99.2"
+ case $host_os in
+-linux*) ;;
++linux*|dragonfly*|freebsd*) ;;
+      *) NEEDED="$NEEDED pthread-stubs" ;;
+ esac
+