diff --git a/editors/kakoune/Makefile b/editors/kakoune/Makefile
index c4efadb0890a..9cbffb90a4fb 100644
--- a/editors/kakoune/Makefile
+++ b/editors/kakoune/Makefile
@@ -1,36 +1,44 @@
 PORTNAME=	kakoune
 DISTVERSION=	2023.08.05
 CATEGORIES=	editors
 MASTER_SITES=	https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Modal code editor with a focus on interactivity
 WWW=		https://kakoune.org
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC:H}/UNLICENSE
 
 RUN_DEPENDS=	setsid:sysutils/setsid
 
 USES=		compiler:c++20-lang gmake tar:bzip2
 DATADIR=	${PREFIX}/share/kak
 DOCSDIR=	${PREFIX}/share/doc/kak
 PATCH_WRKSRC=	${WRKSRC:H}
 WRKSRC_SUBDIR=	src
 
 OPTIONS_DEFINE=	DEBUG DOCS
 
 DEBUG_MAKE_ARGS=	debug=yes
 DEBUG_MAKE_ARGS_OFF=	debug=no
 
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} > 1302506 && ${OSVERSION} < 1400000)
+PATCHFILES=	344d31f42b8ced12626d4f87a22ffa5a671668fd.patch
+PATCH_SITES=	https://github.com/mawww/kakoune/commit/
+PATCH_DIST_STRIP=	-p1
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/-O3/d' \
 		${WRKSRC}/Makefile
 
 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.mk>
+.include <bsd.port.post.mk>
diff --git a/editors/kakoune/distinfo b/editors/kakoune/distinfo
index 237cd605ebe3..31c96a83dcb0 100644
--- a/editors/kakoune/distinfo
+++ b/editors/kakoune/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1691268391
+TIMESTAMP = 1691324812
 SHA256 (kakoune-2023.08.05.tar.bz2) = 3e45151e0addd3500de2d6a29b5aacf2267c42bb256d44a782e73defb29cda5c
 SIZE (kakoune-2023.08.05.tar.bz2) = 568612
+SHA256 (344d31f42b8ced12626d4f87a22ffa5a671668fd.patch) = a0add30e525bef6d5f07d1a55a57287ccb59f54af411308e111c01d247e73842
+SIZE (344d31f42b8ced12626d4f87a22ffa5a671668fd.patch) = 3237