diff --git a/app-misc/yazi/metadata.xml b/app-misc/yazi/metadata.xml
index d626eca12f..928f3e53f7 100644
--- a/app-misc/yazi/metadata.xml
+++ b/app-misc/yazi/metadata.xml
@@ -9,4 +9,7 @@
 		<remote-id type="github">sxyazi/yazi</remote-id>
 		<bugs-to>https://github.com/sxyazi/yazi/issues</bugs-to>
 	</upstream>
+	<use>
+		<flag name="cli">Install CLI Data Distribution Service</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-misc/yazi/yazi-0.2.5.ebuild b/app-misc/yazi/yazi-0.2.5-r1.ebuild
similarity index 94%
rename from app-misc/yazi/yazi-0.2.5.ebuild
rename to app-misc/yazi/yazi-0.2.5-r1.ebuild
index 18d4cfc901..6db0d5ffb7 100644
--- a/app-misc/yazi/yazi-0.2.5.ebuild
+++ b/app-misc/yazi/yazi-0.2.5-r1.ebuild
@@ -324,7 +324,11 @@ LICENSE+="
 SLOT="0"
 KEYWORDS="~amd64"
 
-QA_FLAGS_IGNORED="usr/bin/${PN}"
+IUSE="+cli"
+
+QA_FLAGS_IGNORED="
+	usr/bin/ya.*
+"
 
 DOCS=(
 	README.md
@@ -336,13 +340,26 @@ src_prepare() {
 	eapply_user
 }
 
+src_compile() {
+	cargo_src_compile
+	use cli && cargo_src_compile -p "${PN}-cli"
+}
+
 src_install() {
-	dobin target/$(usex debug debug release)/yazi
+	dobin "target/$(usex debug debug release)/${PN}"
+	use cli && dobin "target/$(usex debug debug release)/ya"
 
 	newbashcomp "${S}/yazi-boot/completions/${PN}.bash" "${PN}"
 	dozshcomp "${S}/yazi-boot/completions/_${PN}"
 	dofishcomp "${S}/yazi-boot/completions/${PN}.fish"
 
+	if use cli
+	then
+		newbashcomp "${S}/yazi-cli/completions/ya.bash" "ya"
+		dozshcomp "${S}/yazi-cli/completions/_ya"
+		dofishcomp "${S}/yazi-cli/completions/ya.fish"
+	fi
+
 	domenu "assets/${PN}.desktop"
 	einstalldocs
 }