diff --git a/app-emacs/emacs-crystal-mode/Manifest b/app-emacs/emacs-crystal-mode/Manifest
index 2c9e23c7f0cd..4578a663fd5c 100644
--- a/app-emacs/emacs-crystal-mode/Manifest
+++ b/app-emacs/emacs-crystal-mode/Manifest
@@ -1 +1,2 @@
 DIST emacs-crystal-mode-0.1.0_p20221008.tar.gz 38944 BLAKE2B 62e8a98bdf036a80dd227a00758146944869c9735867e31f9fc9c7edf01edd937c859d85a348e17fa29c55446309f4dd4958bec42ea23c19dbe4039e1a835bf2 SHA512 12445858a4f71620d9e785b16fa9562e54947f41fcf2ad3299b1e10359c241548686e34e14d7a80f116533bff0a08a3a333cc4616ccb3aa5dadee32ba8a7ae96
+DIST emacs-crystal-mode-0.2.0_p20260111.gh.tar.gz 39634 BLAKE2B 0fc03a1436f63bc8e5428a9df6050492d5c31ae63d45cf5881a0efa820fa715bc12a9105f813843ecfddcfbccf0ac6466796113cd148ed0accac05a128a4fe59 SHA512 9a364ee1eb1809034ce12b3da23db1ac43aefcbc5cf52b6ed626e5e5e18244ebbf44ddeb662f140ae846b38f26b8d8999607a3e82c15645540502d24429e5bbd
diff --git a/app-emacs/emacs-crystal-mode/emacs-crystal-mode-0.2.0_p20260111.ebuild b/app-emacs/emacs-crystal-mode/emacs-crystal-mode-0.2.0_p20260111.ebuild
new file mode 100644
index 000000000000..057744bea765
--- /dev/null
+++ b/app-emacs/emacs-crystal-mode/emacs-crystal-mode-0.2.0_p20260111.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+[[ ${PV} == *p20260111 ]] && COMMIT=559e1d8ff9bb87a4e937978001386bfb58b113a0
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs major mode for editing Crystal programming language files"
+HOMEPAGE="https://github.com/crystal-lang-tools/emacs-crystal-mode/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/crystal-lang-tools/${PN}"
+else
+	SRC_URI="https://github.com/crystal-lang-tools/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/flycheck-30
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert tests -l tests/crystal-mode-tests.el
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}