diff --git a/devel/libqsbr/Makefile b/devel/libqsbr/Makefile
index 205d04fe1d1e..a864a3acbe22 100644
--- a/devel/libqsbr/Makefile
+++ b/devel/libqsbr/Makefile
@@ -1,26 +1,31 @@
 PORTNAME=	libqsbr
 PORTVERSION=	g2020082801
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	QSBR and EBR library
 WWW=		https://github.com/rmind/libqsbr
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BROKEN_i386=	static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter")
-BROKEN_powerpc=	static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter")
+# the fix uses __LONG_WIDTH__ which is only available from FreeBSD 13
+BROKEN_FreeBSD_12_i386=		static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter")
+BROKEN_FreeBSD_12_armv6=	static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter")
+BROKEN_FreeBSD_12_armv7=	static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter")
+BROKEN_FreeBSD_12_powerpc=	static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter")
+BROKEN_FreeBSD_12_mips=		static_assert(sizeof(qsbr_epoch_t) == 8, "expected 64-bit counter")
 
 USES=		compiler:c11 gmake libtool:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmind
 GH_TAGNAME=	e73407c
 WRKSRC_SUBDIR=	src
 USE_LDCONFIG=	yes
 MAKE_ENV=	DESTDIR=${STAGEDIR}${PREFIX} \
 		INCDIR=${LOCALBASE}/include \
 		LIBDIR=${LOCALBASE}/lib \
 		MANDIR=${LOCALBASE}/man
+TEST_TARGET=	tests
 
 .include <bsd.port.mk>
diff --git a/devel/libqsbr/files/patch-qsbr.h b/devel/libqsbr/files/patch-qsbr.h
new file mode 100644
index 000000000000..3a6f9d505741
--- /dev/null
+++ b/devel/libqsbr/files/patch-qsbr.h
@@ -0,0 +1,14 @@
+--- qsbr.h.orig	2023-10-25 22:40:12 UTC
++++ qsbr.h
+@@ -13,7 +13,11 @@
+ 
+ struct qsbr;
+ typedef struct qsbr qsbr_t;
++#if defined(__LONG_WIDTH__) && __LONG_WIDTH < 64
++typedef unsigned long long qsbr_epoch_t;
++#else
+ typedef unsigned long qsbr_epoch_t;
++#endif
+ 
+ __BEGIN_DECLS
+