diff --git a/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.0.2.ebuild b/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.0.2.ebuild
index 53b13c6b81..0f6c1425e7 100644
--- a/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.0.2.ebuild
+++ b/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit readme.gentoo-r1
+inherit readme.gentoo-r1 shell-completion
 
 DESCRIPTION="ZSH port of Fish history search (up arrow)"
 HOMEPAGE="https://github.com/zsh-users/zsh-history-substring-search"
@@ -21,8 +21,7 @@ DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
 at the end of your ~/.zshrc"
 
 src_install() {
-	insinto /usr/share/zsh/site-functions
-	doins ${PN}.zsh
+	newzshcomp "${PN}.zsh" "_${PN}"
 
 	readme.gentoo_create_doc
 	einstalldocs
diff --git a/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.1.0.ebuild b/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.1.0.ebuild
index 53b13c6b81..0f6c1425e7 100644
--- a/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.1.0.ebuild
+++ b/app-shells/zsh-history-substring-search/zsh-history-substring-search-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit readme.gentoo-r1
+inherit readme.gentoo-r1 shell-completion
 
 DESCRIPTION="ZSH port of Fish history search (up arrow)"
 HOMEPAGE="https://github.com/zsh-users/zsh-history-substring-search"
@@ -21,8 +21,7 @@ DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
 at the end of your ~/.zshrc"
 
 src_install() {
-	insinto /usr/share/zsh/site-functions
-	doins ${PN}.zsh
+	newzshcomp "${PN}.zsh" "_${PN}"
 
 	readme.gentoo_create_doc
 	einstalldocs