diff --git a/ChangeLog b/ChangeLog
index bb5fed949..6069f2dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-23  Oliver Kiddle  <opk@zsh.org>
 
+	* 20180 (based on Jean-Baptiste Quenot's 20177):
+	Completion/Unix/Command/_killall: fix to work on BSD systems
+
 	* Motoi Washida <a66@h8.dion.ne.jp>: 20179 (tweaked):
 	Completion/Darwin/Type/_mac_applications,
 	Completion/Darwin/Command/_open, Completion/Darwin/Command/_defaults:
diff --git a/Completion/Unix/Command/_killall b/Completion/Unix/Command/_killall
index 6ec022227..375b1bf74 100644
--- a/Completion/Unix/Command/_killall
+++ b/Completion/Unix/Command/_killall
@@ -1,9 +1,9 @@
 #compdef killall killall5
 
-if [[ $service = killall && "$OSTYPE" = linux* ]]; then
+if [[ $service = killall && "$OSTYPE" = (linux*|*bsd*|darwin*) ]]; then
   _alternative \
-      'signals:: _signals -p' \
-      'processes:process:{ compadd "$expl[@]" ${${${${(f)"$(_call_program processes-names ps ${${EUID/(#s)0(#e)/xa}//[0-9]#/} ho cmd 2> /dev/null)"//[][\(\)]/}:#(ps|COMMAND|-*)}%%\ *}:t} }'
+    'signals:: _signals -p' \
+    'processes-names:process:{ compadd "$expl[@]" ${${${${(f)"$(_call_program processes-names ps ${${EUID/(#s)0(#e)/xa}//[0-9]#/}ho command 2> /dev/null)"//[][\(\)]/}:#(ps|COMMAND|-*)}%%\ *}:t} }'
 else
   _signals -p
 fi