diff --git a/fix-patchutils-completion.patch b/fix-patchutils-completion.patch
new file mode 100644
index 0000000..b12e9fe
--- /dev/null
+++ b/fix-patchutils-completion.patch
@@ -0,0 +1,29 @@
+Index: zsh-5.3/Completion/Unix/Command/_patchutils
+===================================================================
+--- zsh-5.3.orig/Completion/Unix/Command/_patchutils
++++ zsh-5.3/Completion/Unix/Command/_patchutils
+@@ -43,6 +43,7 @@ case $service in
+       '(-F --files)'{-F+,--files=}'[only list files within specified range]:range'
+       '--strip=[remove specified number of pathname components before displaying]:components'
+       '--addprefix=[insert specified path prefix before displaying path names]:prefix:_directories'
++      '*:diff file:_files'
+     )
+   ;|
+   grepdiff|lsdiff)
+@@ -58,7 +59,6 @@ case $service in
+       \*{-v,--verbose}'[verbose operation]' 
+       '(-H --with-filename -h --no-filename)'{-H,--with-filename}'[print the name of the patch file containing each patch]'
+       '!--filter' '!--grep'
+-      '*:diff file:_files'
+     )
+   ;;
+   grepdiff|filterdiff)
+@@ -71,7 +71,7 @@ case $service in
+       '--as-numbered-lines=[display lines of selected hunks]:line numbers:(before after)'
+       "--remove-timestamps[don't include timestamps in output]"
+     )
+-  ;;
++  ;|
+   filterdiff)
+     args+=(
+       '(-X --exclude-from-file)'{-X+,--exclude-from-file=}'[exclude files matching any pattern listed in specified file]:file:_files'
diff --git a/zsh.changes b/zsh.changes
index 58eb89e..fa4728a 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 10 16:27:19 UTC 2017 - jmatejek@suse.com
+
+- fix broken completion for filterdiff: fix-patchutils-completion.patch
+  (boo#1019130)
+
 -------------------------------------------------------------------
 Wed Dec 14 09:37:40 UTC 2016 - idonmez@suse.com
 
diff --git a/zsh.spec b/zsh.spec
index 8cd732f..e65c60f 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package zsh
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,6 +41,7 @@ Patch1:         trim-unneeded-completions.patch
 # PATCH-FIX-OPENSUSE zsh-osc-completion.patch -- Fix openSUSE versions in osc completion
 Patch2:         zsh-osc-completion.patch
 Patch3:         fix-printf.patch
+Patch4:         fix-patchutils-completion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  groff
 %if 0%{?suse_version}
@@ -103,6 +104,7 @@ This package contains the Zsh manual in html format.
 %endif
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Remove executable bit
 chmod 0644 Etc/changelog2html.pl