diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in
index 16919134..fded4144 100644
--- a/contrib/zsh_completion.in
+++ b/contrib/zsh_completion.in
@@ -221,23 +221,20 @@ _pacman_completions_all_groups() {
 # these can be specified as either 'package' or 'repository/package'
 _pacman_completions_all_packages() {
 	local -a cmd packages repositories packages_long
+	_pacman_get_command
+
+	if compset -P1 '*/*'; then
+		packages=( $(_call_program packages $cmd[@] -Sql ${words[CURRENT]%/*}) )
+		typeset -U packages
+		_wanted repo_packages expl "repository/package" compadd ${(@)packages}
+	else
+		packages=( $(_call_program packages $cmd[@] -Sql) )
+		typeset -U packages
+		_wanted packages expl "packages" compadd - "${(@)packages}"
 
-	repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
-	typeset -U repositories
-	packages_long=(@localstatedir@/lib/pacman/sync/${^repositories}/*(/))
-	packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} )
-	typeset -U packages
-	_wanted packages expl "packages" compadd - "${(@)packages}"
-	if [[ $PREFIX != */* ]] ; then
 		repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
 		typeset -U repositories
 		_wanted repo_packages expl "repository/package" compadd -S "/" $repositories
-	else
-		compset -P '*/'
-		packages_long=(@localstatedir@/lib/pacman/sync/$IPREFIX*(/))
-		packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} )
-		typeset -U packages
-		_wanted repo_packages expl "repository/package" compadd ${(@)packages}
 	fi
 }