diff --git a/share/completions/killall.fish b/share/completions/killall.fish
index 217827298..679e4f0b6 100644
--- a/share/completions/killall.fish
+++ b/share/completions/killall.fish
@@ -13,7 +13,7 @@ for i in $__kill_signals
     set -q numname[2]
     and set -l name $numname[2]
     complete -c killall -o $number -d $name
-    complete -c killall -o $name
+    complete -c killall -o $name -d $name
     # The `-s` flag doesn't work in OS X
     test "$OS" != Darwin
     and complete -c killall -s s -x -a "$number $name"
@@ -30,17 +30,17 @@ if killall --version >/dev/null 2>/dev/null # GNU
     complete -c killall -s w -l wait -d 'Wait for all killed processes to die'
     complete -c killall -s v -l version -d 'Print version'
 else # probably BSD
-    complete -c killall -s v -d 'Be more verbose about what will be done'
-    complete -c killall -s e -d 'Use effective UID instead of the real UID for matching processes specified with the -u option'
-    complete -c killall -s help -d 'Print help and exit'
-    complete -c killall -s l -d 'List names of available signals and exit'
-    complete -c killall -s m -d 'Case sensitive argument match for processed'
-    complete -c killall -s s -d 'Simulate, but do not send any signals'
-    complete -c killall -s d -d "Print detailed info. Doesn't send signals"
-    complete -c killall -s u -x -a "(__fish_complete_users)" -d 'Kill only processes the specified user owns. Command names are optional'
+    complete -c killall -s v -d 'Print what is done'
+    complete -c killall -s e -d 'Use effective UID instead of the real UID for -u'
+    complete -c killall -s help
+    complete -c killall -s l -d 'List names of available signals'
+    complete -c killall -s m -d 'Case sensitive process matching'
+    complete -c killall -s s -d "Simulate, send no signals"
+    complete -c killall -s d -d "Simulate & summarize, send no signals"
+    complete -c killall -s u -x -a "(__fish_complete_users)" -d "kill given user's processes"
     complete -c killall -s -u -l user -x -a "(__fish_complete_users)"
-    complete -c killall -s t -d 'Limit to processes running on specified TTY'
+    complete -c killall -s t -d 'Limit to processes on specified TTY'
     complete -c killall -s t -xa "(ps a -o tty | sed 1d | uniq)"
-    complete -c killall -s c -x -d 'Limit to processes matching specified PROCNAME'
-    complete -c killall -s z -d 'Do not skip zombies'
+    complete -c killall -s c -x -d 'Limit to processes matching pattern'
+    complete -c killall -s z -d "Don't skip zombies"
 end