diff --git a/app-shells/zoxide/zoxide-0.9.1.ebuild b/app-shells/zoxide/zoxide-0.9.1.ebuild
index ffe03bab53..121c0c479e 100644
--- a/app-shells/zoxide/zoxide-0.9.1.ebuild
+++ b/app-shells/zoxide/zoxide-0.9.1.ebuild
@@ -119,7 +119,7 @@ CRATES="
 	windows_x86_64_msvc@0.48.0
 "
 
-inherit cargo bash-completion-r1
+inherit cargo shell-completion
 
 DESCRIPTION="A smarter cd command for your terminal"
 HOMEPAGE="https://github.com/ajeetdsouza/zoxide"
@@ -151,12 +151,8 @@ src_install() {
 	dodoc README.md CHANGELOG.md
 
 	newbashcomp contrib/completions/"${PN}".bash "${PN}"
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/completions/_"${PN}"
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins contrib/completions/"${PN}".fish
+	dozshcomp contrib/completions/_"${PN}"
+	dofishcomp contrib/completions/"${PN}".fish
 
 	insinto /usr/share/"${PN}"
 	doins init.fish