diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index fefa5d1730032..315dc8b269dd6 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -2,3 +2,4 @@ DIST kakoune-2022.10.31.tar.bz2 556473 BLAKE2B 36489de5e4fa4406a847f43bf0f966c08
 DIST kakoune-2023.08.05.tar.bz2 568612 BLAKE2B bbedc16f361a242c4319a852c3b688186e1e2b204990aff8434ad8a169d4c62171d2d3424e3bf65a4b5b6b17e21205e84077198091687094f88235e27c544bbd SHA512 f29b787ab6f04bc5a1a3ab31d189128745c967b5eec15fce07ae7dbaf29247f7413499d9925cf0561173feb0fe634f3423ac43da0d6c1ba5d679ee38b80ac679
 DIST kakoune-2024.05.18.tar.bz2 588347 BLAKE2B 3c551d1ccdccbfcc64e52d5e4b32e37f2d4f68188ac3aedd651bfc0af9324c458992eff79d37c2f5ec58135b0923aecfb8d1308be3d6878fe15c8b44fcbd6472 SHA512 4feba6b9a75fd16c1c8151139ac5a98d113f2ab1a5c9e7d03ac194d9d6d67d7dfa25b4e6073546b8dafa241de5db4ddbce4405faa42d710bbc9200f3fab12e4b
 DIST kakoune-2025.06.03.tar.bz2 603942 BLAKE2B de2d985e423660ed4e78be6b7dc93b15ff1fdb2b13133faa6145af0656f8ea425f7bbe82f0047ad8f1e1c9a8caf50a5e430cee717c9d10c13d5f3213419d18c3 SHA512 1fc397f29841d933cc3f768ee05aded111df4f3448099ef0603549455f158fc8ad4e0561a2d3e82f1862b8cd802e1c9cd24434c53bcd68b81e28cfa4b3a416e4
+DIST kakoune-2026.05.21.tar.bz2 639744 BLAKE2B 37563490b775b518f71401fb1802e816add3421d7a8a9944395ad66d2d2ebb773bd4407df2d1fb0ff5f10f41f62e938a5c01cd8fb7c02f9624a3c1ea3ea777d7 SHA512 fb93bb0bb9f326f6d09879a805b3d9ee9b4bef0583b280118f950b48b52a4c536868aac7458cff6431216232eb3e953cf2fbe80640249076649f9971acc79619
diff --git a/app-editors/kakoune/kakoune-2026.05.21.ebuild b/app-editors/kakoune/kakoune-2026.05.21.ebuild
new file mode 100644
index 0000000000000..e17b691fcb6ea
--- /dev/null
+++ b/app-editors/kakoune/kakoune-2026.05.21.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Modal editor inspired by vim"
+HOMEPAGE="https://kakoune.org/ https://github.com/mawww/kakoune"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mawww/kakoune.git"
+else
+	SRC_URI="https://github.com/mawww/kakoune/releases/download/v${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i '/CXXFLAGS-debug-no = -O3 -g3/d' Makefile || die
+	sed -i '/CXX = c++/d' Makefile || die
+	default
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake all
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install
+
+	rm "${ED}/usr/share/man/man1/kak.1.gz" || die
+	doman doc/kak.1
+}