diff --git a/completion/bash-completion.sh b/completion/bash-completion.sh
index 92b1ef6c..472bcb09 100644
--- a/completion/bash-completion.sh
+++ b/completion/bash-completion.sh
@@ -5,12 +5,7 @@ _ponysay()
     local cur prev words cword
     _init_completion -n = || return
     
-    quotes=$(/usr/lib/ponysay/pq4ps --list 2>/dev/null)
-    quotesexit=$?
-    options='-v -h -l -f -W'
-    if [[ $quotesexit = 0 ]]; then
-	options="$options -q"
-    fi
+    options='-v -h -l -f -W -q'
     COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
     
     if [[ $prev = "-f" ]]; then
@@ -32,7 +27,7 @@ _ponysay()
     elif [[ $prev = "-W" ]]; then
 	cols=$(( `stty size | cut -d ' ' -f 2` - 10 ))
 	COMPREPLY=( $cols  $(( $cols / 2 ))  100  60 )
-    elif [[ $quotesexit = 0 ]] && [[ $prev = "-q" ]]; then
+    elif [[ $prev = "-q" ]]; then
 	COMPREPLY=( $( compgen -W "$quotes" -- "$cur" ) )
     fi
 }
diff --git a/completion/fish-completion.fish b/completion/fish-completion.fish
index 802cbf27..1339cf66 100644
--- a/completion/fish-completion.fish
+++ b/completion/fish-completion.fish
@@ -24,7 +24,9 @@ end
 complete -c ponysay -s h --description "Help of ponysay"
 complete -c ponysay -s v --description "Version of ponysay"
 complete -c ponysay -s l --description "List pony files"
-complete -c ponysay -s f -a "$homeponies $systemponies" --description "Ponyfile"
+complete -c ponysay -s L --description "List pony files with alternatives"
+complete -c ponysay -s f -a "$homeponies $systemponies" --description "Select a pony"
+complete -c ponysay -s q -a "$homeponies $systemponies" --description "Select ponies for MLP:FiM quotes"
 complete -c ponysay -s W -a "Integer" --description "The screen column where the message should be wrapped"
 
 
diff --git a/completion/zsh-completion.zsh b/completion/zsh-completion.zsh
index 07b2ebfb..5222d38b 100644
--- a/completion/zsh-completion.zsh
+++ b/completion/zsh-completion.zsh
@@ -3,7 +3,9 @@ _shortopts=(
     '-v[Show version and exit]'
     '-h[Show this help and exit]'
     '-l[list ponyfiles]'
+    '-L[list ponyfiles with alternatives]'
     '-f[Select a pony (either a filename or a ponyname]: :_path_files -W "/usr/share/ponysay/ponies" -g "*(\:r)"'
+    '-q[Select ponies for MLP:FiM quotes]'
     '-W[The screen column where the message should be wrapped]'
     )
 _arguments -s : \