diff --git a/app-emacs/yaml-mode/yaml-mode-0.0.16-r1.ebuild b/app-emacs/yaml-mode/yaml-mode-0.0.16-r1.ebuild
new file mode 100644
index 0000000000000..ebf58b0d53535
--- /dev/null
+++ b/app-emacs/yaml-mode/yaml-mode-0.0.16-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A major mode for GNU Emacs for editing YAML files"
+HOMEPAGE="https://github.com/yoshiki/yaml-mode/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/yoshiki/${PN}"
+else
+	SRC_URI="https://github.com/yoshiki/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( Changes README )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert test
diff --git a/app-emacs/yaml-mode/yaml-mode-0.0.16.ebuild b/app-emacs/yaml-mode/yaml-mode-0.0.16.ebuild
deleted file mode 100644
index d9246138a4fe3..0000000000000
--- a/app-emacs/yaml-mode/yaml-mode-0.0.16.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="A major mode for GNU Emacs for editing YAML files"
-HOMEPAGE="https://github.com/yoshiki/yaml-mode"
-SRC_URI="https://github.com/yoshiki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-#S="${WORKDIR}/${PN}-release-${PV}"
-DOCS="README Changes"
-SITEFILE="50${PN}-gentoo.el"