2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 24d46a482..d79ebc235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
+2016-06-05  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 38622: Src/jobs.c: consistent handling of "--" in "kill" builtin
+
 2016-06-04  Eric Cook <llua@gmx.com>
+
 	* 38547: Completion/compdump: only autoload functions
 	when they exist in fpath.
 
diff --git a/Src/jobs.c b/Src/jobs.c
index 2a9dbe7d6..04cb6b344 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -2527,6 +2527,10 @@ bin_kill(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func))
 	argv++;
     }
 
+    /* Discard the standard "-" and "--" option breaks */
+    if (*argv && (*argv)[0] == '-' && (!(*argv)[1] || (*argv)[1] == '-'))
+	argv++;
+
     if (!*argv) {
     	zwarnnam(nam, "not enough arguments");
 	return 1;