diff --git a/data/_xbps b/data/_xbps
index 9e3f8e97..ac2e3910 100644
--- a/data/_xbps
+++ b/data/_xbps
@@ -44,11 +44,11 @@ _xbps_properties=(
 )
 
 _xbps_all_packages() {
-	compadd "$@" -- $(xbps-query -Rs '' | sed 's/^... \([^ ]*\)-.* .*/\1/')
+	compadd "$@" -- ${${${(f)"$(xbps-query -Rs '')"}#??? }%%-[^- ]# *}
 }
 
 _xbps_installed_packages() {
-	compadd "$@" -- $(xbps-query -l | sed 's/^.. \([^ ]*\)-.* .*/\1/')
+	compadd "$@" -- ${${${(f)"$(xbps-query -l)"}#?? }%%-[^- ]# *}
 }
 
 _xbps_checkvers() {