diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index fe017452bed7..d117caae3c0b 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kakoune
 DISTVERSION=	2024.05.18
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/
 
@@ -10,28 +11,21 @@ WWW=		https://kakoune.org
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
 
+# See https://github.com/mawww/kakoune/issues/2520
 RUN_DEPENDS=	setsid:sysutils/setsid
 
-USES=		compiler:c++20-lang gmake tar:bzip2
+USES=		compiler:c++20-lang tar:bzip2
 DATADIR=	${PREFIX}/share/kak
 DOCSDIR=	${PREFIX}/share/doc/kak
-PATCH_WRKSRC=	${WRKSRC:H}
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
 DEBUG_MAKE_ARGS=	debug=yes
-DEBUG_MAKE_ARGS_OFF=	debug=no
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e '/-O3/d' \
-		${WRKSRC}/Makefile
+TEST_TARGET=	test
+TEST_ENV+=	LC_ALL=en_US.UTF-8
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/kak
 
-do-test:
-	@cd ${WRKSRC:H}/test && ${SETENV} LC_ALL=en_US.UTF-8 ./run
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>