diff --git a/devel/freebsd-git-devtools/Makefile b/devel/freebsd-git-devtools/Makefile
index 756aa00011e4..071b5ffd2108 100644
--- a/devel/freebsd-git-devtools/Makefile
+++ b/devel/freebsd-git-devtools/Makefile
@@ -1,44 +1,50 @@
 PORTNAME=	freebsd-git-devtools
-PORTVERSION=	20230925
-PORTREVISION=	1
+PORTVERSION=	20240422
 CATEGORIES=	devel
 MASTER_SITES=	https://cgit.freebsd.org/src/plain/tools/tools/git/
-DISTFILES=	git-arc.sh?id=${_REV} \
+DISTFILES=	candidatematch.lua?id=${_REV} \
+		git-arc.sh?id=${_REV} \
 		git-arc.1?id=${_REV} \
 		mfc-candidates.sh?id=${_REV}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Simple Git tools from the FreeBSD src tree
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	arc:devel/arcanist \
 		git:devel/git \
 		jq:textproc/jq
 
+USES=		lua shebangfix
+SHEBANG_FILES=	candidatematch.lua?id=${_REV}
+lua_OLD_CMD=	/usr/libexec/flua
+
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 NO_WRKSUBDIR=	yes
 
-PLIST_FILES=	bin/git-arc \
+PLIST_FILES=	bin/candidatematch.lua \
+		bin/git-arc \
 		bin/mfc-candidates \
 		share/man/man1/git-arc.1.gz
 
-_REV=		61f8df6a13a357e1d45c22a2016b87491f10de87
+_REV=		76a8625bc71da3fa63eef5abb4782553d2588f5c
 
 post-patch:
 	for f in ${WRKSRC}/*\?id=*; do \
 		nn=$$(${ECHO_CMD} $$f | ${SED} -e s/\?id=.*//); ${MV} $$f $$nn; \
 	done
 
 do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/candidatematch.lua ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/git-arc.sh ${STAGEDIR}${PREFIX}/bin/git-arc
 	${INSTALL_SCRIPT} ${WRKSRC}/mfc-candidates.sh ${STAGEDIR}${PREFIX}/bin/mfc-candidates
 	${INSTALL_MAN} ${WRKSRC}/git-arc.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/devel/freebsd-git-devtools/distinfo b/devel/freebsd-git-devtools/distinfo
index 1d1a19748de0..05109017e881 100644
--- a/devel/freebsd-git-devtools/distinfo
+++ b/devel/freebsd-git-devtools/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1695735108
-SHA256 (freebsd-git-devtools/git-arc.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 5dbcbde74b3a781b6d2ecff1929148c83ff0ff3608c0f1110327cffddf2cb25c
-SIZE (freebsd-git-devtools/git-arc.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 17038
-SHA256 (freebsd-git-devtools/git-arc.1?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 011b470468af2994b0e0cca164dcf0ccfb870946fd3c5bb0ca7c4a0cb8b36b9d
-SIZE (freebsd-git-devtools/git-arc.1?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 7111
-SHA256 (freebsd-git-devtools/mfc-candidates.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = ad11d61abc37134b4a5a37e587e80144bdcce05fbfb3145892df1ab6f92f1d4d
-SIZE (freebsd-git-devtools/mfc-candidates.sh?id=61f8df6a13a357e1d45c22a2016b87491f10de87) = 4450
+TIMESTAMP = 1715004431
+SHA256 (freebsd-git-devtools/candidatematch.lua?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 36098f6871d1ed79ed588bd8a7bb906a5f5ab291e2e3fe32aad2adf096142918
+SIZE (freebsd-git-devtools/candidatematch.lua?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 1748
+SHA256 (freebsd-git-devtools/git-arc.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 2125d0a57c522ab24a43091f851dbdd9b33633699eef84195c480630301335da
+SIZE (freebsd-git-devtools/git-arc.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 23024
+SHA256 (freebsd-git-devtools/git-arc.1?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 3b7660960d39bbe310194f985d5cbc08836cad249e29da0692dfe7945275dc8e
+SIZE (freebsd-git-devtools/git-arc.1?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 7469
+SHA256 (freebsd-git-devtools/mfc-candidates.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = adc38b6815d3ba672fc0fc108a79ef76e0e5ce97d027a30b21a189951f3cb1d4
+SIZE (freebsd-git-devtools/mfc-candidates.sh?id=76a8625bc71da3fa63eef5abb4782553d2588f5c) = 4190