diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile
index 5d591fbe1c10..eb5f18e7de38 100644
--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@@ -1,40 +1,51 @@
 PORTNAME=	stress-ng
 DISTVERSIONPREFIX=	V
 DISTVERSION=	0.13.09
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Stress test benchmarks
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-
-USES=		compiler:c11 gmake tar:xz
+USES=		compiler:c11 gmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	ColinIanKing
 
 ALL_TARGET=	# empty
 
 PLIST_FILES=	bin/stress-ng man/man1/stress-ng.1.gz
 
-OPTIONS_DEFINE=	LIBINOTIFY
-OPTIONS_DEFAULT=	LIBINOTIFY
-LIBINOTIFY_DESC=	Install the kevent based libinotify to enable its stress
+OPTIONS_DEFINE=		JUDY LIBINOTIFY
+OPTIONS_DEFINE_amd64=	INTELIPSEC
+OPTIONS_DEFAULT=	JUDY LIBINOTIFY
+OPTIONS_DEFAULT_amd64=	INTELIPSEC
+
+INTELIPSEC_DESC=	Enable support for Intel's IPsec library
+JUDY_DESC=		Enable support for (lib)Judy
+LIBINOTIFY_DESC=	Enable support for libinotify
+
+INTELIPSEC_LIB_DEPENDS=		libIPSec_MB.so:security/intel-ipsec-mb
+INTELIPSEC_MAKE_ARGS_OFF=	HAVE_LIB_IPSEC_MB=0
+
+JUDY_LIB_DEPENDS=		libJudy.so:devel/judy
+JUDY_MAKE_ARGS_OFF=		HAVE_LIB_JUDY=0
+
+LIBINOTIFY_LIB_DEPENDS=		libinotify.so:devel/libinotify
+LIBINOTIFY_LDFLAGS=		-linotify
+LIBINOTIFY_MAKE_ARGS_OFF=	HAVE_SYS_INOTIFY_H=0
 
-LIBINOTIFY_CFLAGS	+=	-I${LOCALBASE}/include
-LIBINOTIFY_LDFLAGS	+=	-L${LOCALBASE}/lib -linotify
-LIBINOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
+MAKE_ARGS=	VERBOSE=1
 
 post-patch:
 	${REINPLACE_CMD} -e \
 		's/int main(void)/int main(void) __attributes__((noinline))/' \
 		${WRKSRC}/stress-atomic.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c
deleted file mode 100644
index d54609e2fc7f..000000000000
--- a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- stress-tlb-shootdown.c.orig	2021-12-19 20:49:35 UTC
-+++ stress-tlb-shootdown.c
-@@ -64,7 +64,11 @@ static int stress_tlb_shootdown(const stress_args_t *a
- 		const int32_t max_cpus = stress_get_processors_configured();
- 
- 		CPU_ZERO(&proc_mask);
-+#ifdef CPU_ALLOC
- 		CPU_OR(&proc_mask, &proc_mask_initial, &proc_mask);
-+#else
-+		CPU_OR(&proc_mask, &proc_mask_initial);
-+#endif
- 
- 		tlb_procs = max_cpus;
- 		if (tlb_procs > MAX_TLB_PROCS)