diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index bdf105e02b..196fa2b0b3 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -422,15 +422,19 @@ d=`dirname $srcfile`
   # file names to be put into the .tar.gz for sources.
   # Omit patterns that do not expand to file names.
   pats=
-  for pat in '*.texinfo' '*.texi' '*.txi' '*.eps'; do
+  for pat in '*.eps'; do
     for file in $pat; do
       test "$file" = "$pat" && test ! -e "$file" || pats="$pats $pat"
       break
     done
   done
 
-  tar -czhf "$abs_outdir/$PACKAGE.texi.tar.gz" \
-    -- $pats ${source_extra+"$source_extra"} &&
+  base=`basename "$srcfile"`
+
+  cmd="$SETLANG $MAKEINFO $commonarg --trace-includes \"$base\""
+  eval "$cmd" | tar -czhf "$abs_outdir/$PACKAGE.texi.tar.gz" \
+    --verbatim-files-from -T- -- "$base" $pats \
+    ${source_extra+"$source_extra"} &&
   ls -l "$abs_outdir/$PACKAGE.texi.tar.gz"
 ) || exit
 texi_tgz_size=`calcsize "$outdir/$PACKAGE.texi.tar.gz"`