diff --git a/Doc/tools/mkhowto b/Doc/tools/mkhowto
index 3dd744ddea3..cf8a3cca829 100755
--- a/Doc/tools/mkhowto
+++ b/Doc/tools/mkhowto
@@ -361,13 +361,16 @@ class Job:
 
     def write_l2h_aux_init_file(self):
         fp = open(self.l2h_aux_init_file, "w")
+        d = string_to_perl(os.path.dirname(L2H_INIT_FILE))
+        fp.write("package main;\n"
+                 "push (@INC, '%s');\n"
+                 "$mydir = '%s';\n"
+                 % (d, d))
         fp.write(open(L2H_INIT_FILE).read())
         fp.write("\n"
                  "# auxillary init file for latex2html\n"
                  "# generated by mkhowto\n"
-                 "push (@INC, '%s');\n"
                  "$NO_AUTO_LINK = 1;\n"
-                 % os.path.dirname(L2H_INIT_FILE)
                  )
         options = self.options
         l2hoption(fp, "ABOUT_FILE", options.about_file)
diff --git a/Doc/tools/mkhtml.sh b/Doc/tools/mkhtml.sh
index 304839c60ad..fcd2ea01d45 100755
--- a/Doc/tools/mkhtml.sh
+++ b/Doc/tools/mkhtml.sh
@@ -31,7 +31,9 @@ else
     mkdir $part
 fi
 
-echo "latex2html -init_file $srcdir/perl/l2hinit.perl -dir $part" \
+echo "latex2html -no_auto_link" \
+ "-up_url '../index.html' -up_title 'Documentation Index'" \
+ "-init_file $srcdir/perl/l2hinit.perl -dir $part" \
  "${1:+$@} $srcdir/$part/$part.tex"
 latex2html \
  -no_auto_link \