diff --git a/x11-servers/xarcan/Makefile b/x11-servers/xarcan/Makefile
index fd04cd1417bb..29b5becd63f1 100644
--- a/x11-servers/xarcan/Makefile
+++ b/x11-servers/xarcan/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	xarcan
 DISTVERSION=	0.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-servers
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	2be9063af666.patch:-p1 # https://github.com/letoram/xarcan/pull/8
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Arcan client
 WWW=		https://arcan-fe.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libarcan_shmif_ext.so:multimedia/arcan
 RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 		xkeyboard-config>0:x11/xkeyboard-config
 
 USES=		compiler:c11 gl meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GH_ACCOUNT=	letoram
 MESON_ARGS=	-D${PORTNAME}=true \
 		-Dxorg=false \
 		-Dxnest=false \
 		-Dxvfb=false \
 		-Dxwayland=false \
 		-Dudev=false \
 		-Dudev_kms=false \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xarcan
 
 # Keep in sync with xorg-server
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
 FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
 DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/misc/	\
 	${FONTPATH_ROOT}/TTF/ \
 	${FONTPATH_ROOT}/OTF/ \
 	${FONTPATH_ROOT}/Type1/ \
 	${FONTPATH_ROOT}/100dpi/ \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
 do-install:
 # XXX Prevent Meson from installing unrelated files
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/kdrive/arcan/Xarcan \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11-servers/xarcan/files/patch-clang16 b/x11-servers/xarcan/files/patch-clang16
new file mode 100644
index 000000000000..a86f06fddfb8
--- /dev/null
+++ b/x11-servers/xarcan/files/patch-clang16
@@ -0,0 +1,33 @@
+https://github.com/letoram/xarcan/commit/c6173b4f6682
+
+../hw/kdrive/arcan/arcan.c:1523:21: error: incompatible function pointer types initializing 'present_abort_vblank_ptr' (aka 'void (*)(struct _rrCrtc *, unsigned long, unsigned long)') with an expression of type 'void (void *)' [-Wincompatible-function-pointer-types]
+    .abort_vblank = arcanPresentAbortVblank,
+                    ^~~~~~~~~~~~~~~~~~~~~~~
+../hw/kdrive/arcan/arcan.c:1704:25: warning: incompatible pointer types passing 'miPointerSpriteFuncRec *' (aka 'struct _miPointerSpriteFuncRec *') to parameter of type 'miPointerScreenFuncPtr' (aka 'struct _miPointerScreenFuncRec *') [-Wincompatible-pointer-types]
+                        &ArcanPointerSpriteFuncs, FALSE);
+                        ^~~~~~~~~~~~~~~~~~~~~~~~
+
+--- hw/kdrive/arcan/arcan.c.orig	2020-11-29 15:29:55 UTC
++++ hw/kdrive/arcan/arcan.c
+@@ -1458,11 +1458,9 @@ static int arcanPresentGetUstMsc(RRCrtcPtr crtc, CARD6
+     return 0;
+ }
+ 
+-static void arcanPresentAbortVblank(void *data)
++static void arcanPresentAbortVblank(RRCrtcPtr crtc, uint64_t evid, uint64_t msc)
+ {
+-    struct ms_present_vblank_event *event = data;
+     trace("present:vblank abort");
+-    free(event);
+ }
+ 
+ static int arcanPresentQueueVblank(RRCrtcPtr crtc, uint64_t evid, uint64_t msc)
+@@ -1701,7 +1699,7 @@ arcanCursorInit(ScreenPtr screen)
+ 
+     miPointerInitialize(screen,
+                         &ArcanPointerSpriteFuncs,
+-                        &ArcanPointerSpriteFuncs, FALSE);
++                        &ArcanPointerScreenFuncs, FALSE);
+ 
+     return TRUE;
+ }