diff --git a/texinfo-6.1-texi2dvi-fix.patch b/texinfo-6.1-texi2dvi-fix.patch
new file mode 100644
index 0000000..281a19f
--- /dev/null
+++ b/texinfo-6.1-texi2dvi-fix.patch
@@ -0,0 +1,29 @@
+diff -up texinfo-6.1/util/texi2dvi.orig texinfo-6.1/util/texi2dvi
+--- texinfo-6.1/util/texi2dvi.orig	2016-02-06 13:21:52.000000000 +0100
++++ texinfo-6.1/util/texi2dvi	2016-02-24 09:36:18.726954888 +0100
+@@ -988,15 +988,16 @@ run_bibtex ()
+ #                         that match PREDICATE.
+ filter_files ()
+ {
+-  test -n "$xref_files_new" && echo "$xref_files_new" |
+-  # Filter existing files matching the criterion.
+-  #
+-  while read file; do
+-    $1 "$file"
+-  done |
+-  sort |
+-  # Some files are opened several times, e.g., listings.sty's *.vrb.
+-  uniq
++  test -n "$xref_files_new" || return 0
++  echo "$xref_files_new" |
++    # Filter existing files matching the criterion.
++    #
++    while read file; do
++      $1 "$file"
++    done |
++    sort |
++    # Some files are opened several times, e.g., listings.sty's *.vrb.
++    uniq
+ }
+ 
+ # run_index - Run texindex (or makeindex or texindy) on current index
diff --git a/texinfo.spec b/texinfo.spec
index efaa11d..d2d9261 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -3,7 +3,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -13,8 +13,10 @@ Source2: info-dir
 # Source5: macro definitions
 Source5: macros.info
 Patch0: texinfo-4.12-zlib.patch
-# this is needed just for koji/mock, all test pass fine in local build
+# Patch1: this is needed just for koji/mock, all test pass fine in local build
 Patch1: texinfo-6.0-disable-failing-info-test.patch
+# Patch2: rhbz#1309702, already upstream
+Patch2: texinfo-6.1-texi2dvi-fix.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: perl >= 5.7.3, perl(Text::Unidecode)
@@ -65,6 +67,7 @@ for printing using TeX.
 %setup -q
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .disable-failing-info-test
+%patch2 -p1 -b .texi2dvi-fix
 
 %build
 %configure --with-external-Text-Unidecode \
@@ -167,6 +170,10 @@ fi
 %{_mandir}/man1/pdftexi2dvi.1*
 
 %changelog
+* Wed Feb 24 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.1-2
+- Fix texi2dvi exits without completing the task
+  Resolves: #1309702
+
 * Thu Feb 11 2016 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.1-1
 - Update to texinfo-6.1
   Resolves: #1305316