diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0-r1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0-r1.ebuild
new file mode 100644
index 0000000000000..2a0606cf5ef59
--- /dev/null
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${P/-mode/}"
+
+inherit elisp
+
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="https://ocaml.org/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ocaml/ocaml"
+else
+	SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}/emacs"
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+DOCS=( README README.itz )
+SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
deleted file mode 100644
index d2eb9a569fce4..0000000000000
--- a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-MY_P=${P/-mode/}
-DESCRIPTION="Emacs mode for OCaml"
-HOMEPAGE="https://ocaml.org/"
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-
-S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo-3.12.1.el"
-DOCS="README README.itz"