--- 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);
     }