diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index a00e1e3004760..874399f7491a2 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1 +1,2 @@
 DIST with-editor-3.5.3.gh.tar.gz 35768 BLAKE2B d05d77257ebad6d62638564408f3fe92c80df09e82d77bd6b919fdbd25c63375332198242b7002bada3cd15da7fc50471f4730060043d24f714bc89ead7f667e SHA512 177c51ba0ea256927b08118372299462f16241fd6da351e8f97448639c0405efdd720e06a3eab87188acc1cc1eef37486c58f951267ba844f16d017830b11d91
+DIST with-editor-3.5.4.gh.tar.gz 35792 BLAKE2B 4f4493f0c895584372b75d9d3aabe1d28c894451cbe0e67e72204c12348ba4c0ff238bcc7a01ea39b2b75390ab62e14af4b97dc136a616e55eec7141fd746a1e SHA512 a7dfa9d2be9f7421bf528f39d13a83fc28f92e297d4702a88a831950308d31c2505f5d3563390e87d1b0de7832043594af702cc714012c73a70dc75121aecb1b
diff --git a/app-emacs/with-editor/with-editor-3.5.4.ebuild b/app-emacs/with-editor/with-editor-3.5.4.ebuild
new file mode 100644
index 0000000000000..b4c5862d67f48
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-3.5.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+NEED_EMACS="28.1"
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor/
+	https://github.com/magit/with-editor/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/magit/${PN}"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+S="${WORKDIR}/${P}/lisp"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-31.0
+	>=app-emacs/cond-let-1.1
+	>=app-emacs/llama-1.0
+"
+BDEPEND="
+	${RDEPEND}
+	sys-apps/texinfo
+"
+
+DOCS=( ../CHANGELOG ../README.org "../docs/${PN}.org" )
+ELISP_TEXINFO="../docs/*.texi"
+SITEFILE="50${PN}-gentoo.el"