diff --git a/quilt-fix-completion.diff b/quilt-fix-completion.diff
new file mode 100644
index 0000000..4b88a32
--- /dev/null
+++ b/quilt-fix-completion.diff
@@ -0,0 +1,21 @@
+From: Bernhard Walle <bwalle@suse.de>
+Subject: [PATCH] Fix bash completion for 'quilt fold <TAB>'
+References: 415762
+
+
+Signed-off-by: Bernhard Walle <bwalle@suse.de>
+
+---
+ bash_completion |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/bash_completion
++++ b/bash_completion
+@@ -184,6 +184,7 @@ _quilt_completion()
+ 	        COMPREPLY=( $( compgen -W "0 1" -- $cur ) )
+ 		;;
+ 	     *)
++                _quilt_comfile
+ 	        COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p" -- $cur ) )
+ 	        ;;
+ 	   esac
diff --git a/quilt.changes b/quilt.changes
index 84a5f3e..e049010 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 12 16:50:26 CEST 2008 - bwalle@suse.de
+
+- fix completion of "quilt fold" (bnc#415762)
+- mark /etc/quilt.quiltrc as %config (rpmlint)
+- mark /etc/bash_completion.d/quilt as %config (rpmlint)
+
 -------------------------------------------------------------------
 Fri Jun 13 15:16:05 CEST 2008 - bwalle@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index c7a7f82..1052d92 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -2,9 +2,16 @@
 # spec file for package quilt (Version 0.46_cvs20080613)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -17,7 +24,7 @@ Summary:        A Tool for Working with Many Patches
 License:        GPL v2 or later
 Group:          Productivity/Text/Utilities
 Version:        0.46_cvs20080613
-Release:        1
+Release:        20
 Requires:       coreutils diffutils patch gzip bzip2 perl mktemp diffstat procmail
 AutoReqProv:    off
 Source:         %{name}-%{version}.tar.bz2
@@ -26,6 +33,7 @@ Recommends:     bash-completion
 Patch1:         expand.diff
 Patch2:         docdir.diff
 Patch3:         patch-wrapper-rpm.diff
+Patch4:         quilt-fix-completion.diff
 Url:            http://savannah.nongnu.org/projects/quilt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -45,7 +53,7 @@ Authors:
 
 %prep
 %setup -q
-%patch -p1 -P 1 -P 2 -P 3
+%patch -p1 -P 1 -P 2 -P 3 -P 4
 
 %build
 autoconf
@@ -99,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/emacs/
 /usr/lib/quilt/
 /etc/bash_completion.d/quilt
-/etc/quilt.quiltrc
+%config /etc/quilt.quiltrc
 %doc %{_mandir}/man1/guards.1.gz
 %doc %{_mandir}/man1/quilt.1.gz
 %doc doc/README
@@ -107,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/quilt.pdf
 
 %changelog
+* Tue Aug 12 2008 bwalle@suse.de
+- fix completion of "quilt fold" (bnc#415762)
+- mark /etc/quilt.quiltrc as %%config (rpmlint)
+- mark /etc/bash_completion.d/quilt as %%config (rpmlint)
 * Fri Jun 13 2008 bwalle@suse.de
 - recommend bash-completion (bnc#399615)
 * Fri Jun 13 2008 agruen@suse.de