diff --git a/bash/yunohost_cli b/bash/yunohost_cli
index 620f71d5..20ed5855 100644
--- a/bash/yunohost_cli
+++ b/bash/yunohost_cli
@@ -8,7 +8,7 @@ COMPREPLY=()
 argc=${COMP_CWORD}
 cur="${COMP_WORDS[argc]}"
 prev="${COMP_WORDS[argc-1]}" 
-opts=$(yunohost-cli -h | grep usage | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
+opts=$(yunohost -h | sed -n "/usage/,/}/p" | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
 
 if [[ $argc = 1 ]];
 then
@@ -19,7 +19,7 @@ if [[ "$prev" != "--help" ]];
 then
 	if [[ $argc = 2 ]];
 	then
-		opts2=$(yunohost-cli $prev -h | grep usage | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
+		opts2=$(yunohost $prev -h | sed -n "/usage/,/}/p" | awk -F"{" '{print $2}' | awk -F"}" '{print $1}' | tr ',' ' ')
 		COMPREPLY=( $(compgen -W "$opts2 --help" -- $cur ) )
 	elif [[ $argc = 3 ]];
 	then
@@ -30,4 +30,4 @@ else
 fi
 
 }
-complete -F _yunohost_cli yunohost-cli
+complete -F _yunohost_cli yunohost