diff --git a/dev-vcs/jj/jj-9999.ebuild b/dev-vcs/jj/jj-9999.ebuild
index 07d5691b43..f7322b9b64 100644
--- a/dev-vcs/jj/jj-9999.ebuild
+++ b/dev-vcs/jj/jj-9999.ebuild
@@ -1,37 +1,34 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cargo
+RUST_MIN_VER="1.84.0"
+
+inherit cargo git-r3
 
 DESCRIPTION="Jujutsu - an experimental version control system"
 HOMEPAGE="https://github.com/jj-vcs/jj"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jj-vcs/jj.git"
-else
-	SRC_URI="
-		https://github.com/jj-vcs/jj/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		${CARGO_CRATE_URIS}
-	"
-	KEYWORDS="~amd64"
-fi
+EGIT_REPO_URI="https://github.com/jj-vcs/jj.git"
 
 LICENSE="Apache-2.0"
 # Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD MIT MPL-2.0 Unicode-DFS-2016"
+LICENSE+="
+	Apache-2.0 BSD MIT MPL-2.0 Unicode-3.0 Unicode-DFS-2016 WTFPL-2
+"
 SLOT="0"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=dev-libs/libgit2-1.8.1:0/1.8
-	dev-libs/openssl
+	dev-libs/openssl:=
 	net-libs/libssh2:=
 	sys-libs/zlib
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
 
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
@@ -44,12 +41,8 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
+	git-r3_src_unpack
+	cargo_live_src_unpack
 }
 
 src_install() {