diff --git a/quilt-support-vimdiff.patch b/quilt-support-vimdiff.patch
new file mode 100644
index 0000000..a0ed096
--- /dev/null
+++ b/quilt-support-vimdiff.patch
@@ -0,0 +1,40 @@
+From: Jean Delvare <jdelvare@suse.de>
+Subject: Fix interaction between quilt and vimdiff
+References: bnc#749563
+
+Using vimdiff as a diff viewer in quilt breaks if QUILT_PAGER is set.
+So inhibit the pager in that case. Other diff viewers may be affected
+as well but I don't know how to fix this in a generic way, short of
+inhibiting the pager as soon as option --diff is passed to the diff
+command. Not sure if this desirable though, as I presume
+non-interactive alternative diff viewers must exist too.
+---
+ quilt/diff.in |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+--- a/quilt/diff.in
++++ b/quilt/diff.in
+@@ -66,7 +66,9 @@ included.
+ 
+ --diff=utility
+ 	Use the specified utility for generating the diff. The utility
+-	is invoked with the original and new file name as arguments.
++	is invoked with the original and new file name as arguments.  If
++	using an interactive text-mode diff viewer that is not known to
++	quilt, you will have to unset QUILT_PAGER for proper result.
+ 
+ --color[=always|auto|never]
+ 	Use syntax coloring.
+@@ -211,6 +213,13 @@ done
+ 
+ QUILT_DIFF_OPTS="$QUILT_DIFF_OPTS $opt_format"
+ 
++# Inhibit pager for interactive text-mode diff viewers
++case "$(basename $opt_diff)" in
++vimdiff)
++	QUILT_PAGER=
++	;;
++esac
++
+ opt_files=( $(for file in "$@"; do echo "$SUBDIR$file" ; done) )
+ 
+ if [ $[0$opt_combine + 0$opt_snapshot + 0$opt_relative] -gt 1 ]
diff --git a/quilt.changes b/quilt.changes
index 71dee36..aeca479 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar  2 14:20:24 CET 2012 - jdelvare@suse.de
+
+- Fix interaction between quilt and vimdiff (bnc#749563).
+
 -------------------------------------------------------------------
 Thu Mar  1 21:29:26 CET 2012 - jdelvare@suse.de
 
diff --git a/quilt.spec b/quilt.spec
index 1cb6047..e146407 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -46,6 +46,7 @@ AutoReqProv:    off
 Source:         %{name}-%{version}.tar.bz2
 Source1:        suse-start-quilt-mode.el
 Patch1:         expand.diff
+patch2:         quilt-support-vimdiff.patch
 Patch3:         patch-wrapper-rpm.diff
 Patch5:         suse-workaround-pseudo-release.patch
 Patch6:         quilt-stable-rebuild.patch
@@ -70,6 +71,7 @@ Authors:
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1