diff --git a/texinfo-4.11-direntry.patch b/texinfo-4.11-direntry.patch
new file mode 100644
index 0000000..1be52cf
--- /dev/null
+++ b/texinfo-4.11-direntry.patch
@@ -0,0 +1,23 @@
+--- texinfo-4.11/makeinfo/cmds.c_old	2007-07-15 19:36:19.000000000 +0200
++++ texinfo-4.11/makeinfo/cmds.c	2007-12-10 15:11:04.000000000 +0100
+@@ -1637,11 +1637,16 @@
+ 
+       if (!no_headers && !html)
+         {
++	  /* use add_* instead of insert_* because otherwise the
++	  file header ("This is ...") will end up inside the
++	  dir section markers.  */
+           kill_self_indent (-1); /* make sure there's no indentation */
+-          insert_string ("INFO-DIR-SECTION ");
+-          insert_string (line);
+-          insert ('\n');
+-        }
++	  cm_noindent (); /* make sure again */
++	  add_word ("INFO-DIR-SECTION ");
++	  add_word (line);
++	  add_char ('\n');
++
++         }
+ 
+       free (line);
+     }
diff --git a/texinfo.spec b/texinfo.spec
index e9ace94..9e89aed 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -1,7 +1,7 @@
 Summary: Tools needed to create Texinfo format documentation files
 Name: texinfo
 Version: 4.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3
 Group: Applications/Publishing
 Url: http://www.gnu.org/software/texinfo/
@@ -10,9 +10,10 @@ Source1: info-dir
 Source2: texi2pdf.man
 Patch0: texinfo-4.11-zlib.patch
 Patch1: texinfo-4.11-res_win_segfault.patch
+Patch2: texinfo-4.11-direntry.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel, ncurses-devel
 
 # Redefine this so "dir" in the info directory isn't compressed
@@ -61,6 +62,7 @@ for printing using TeX.
 %setup -q
 %patch0 -p1 -b .zlib
 %patch1 -p1 -b .res_win_segfault
+%patch2 -p1 -b .direntry
 
 %build
 
@@ -139,6 +141,11 @@ fi
 %{_mandir}/man1/texi2pdf.1*
 
 %changelog
+* Mon Dec 10 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.11-3
+- Don't insert description ("This is...") into the direntry section
+  of some generated files
+  Resolves: #394191
+
 * Tue Nov 13 2007 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.11-2
 - Fix info crashes when resizing window
   Resolves: #243971