diff --git a/ChangeLog b/ChangeLog
index 42bfa15dd..bda980d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,10 @@
 	Fix syntax.
 	(block_header, block_footer, description_header, description_footer,
 	marker_header, marker_footer, source_header, source_footer,
-	chapter_header, chapter_footer): Don't use <center>...</center> but
-	`align=center' table attribute.
+	chapter_header): Don't use <center>...</center> but `align=center'
+	table attribute.
+	(chapter_inter, chapter_footer): Add <li> and use special <ul>
+	class.
 	Use double quotes around table widths given in percent.
 	(keyword_prefix, keyword_suffix): Don't change font colour directly
 	but use a new <span> class.
@@ -21,8 +23,10 @@
 	(print_html_field_list): Ditto.
 	(index_exit): Don't use <center>...</center> but `align=center'
 	table attribute.
-	(toc_exit, section_enter): Ditto.
+	(section_enter): Ditto.
+	(toc_exit): Don't emit </table>.
 	(block_enter): Use <h4><a>, not <a><h4>.
+	(__init__): Fix tag order in self.html_footer.
 
 2003-07-25  David Turner  <david@freetype.org>
 
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index f5c3c541d..2a3cf239b 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -34,6 +34,8 @@ html_header_2= """ API Reference</title>
                  color: darkblue; }
 
   pre.colored { color: blue; }
+
+  ul.empty { list-style-type: none; }
 </style>
 </head>
 <body>
@@ -89,8 +91,8 @@ source_footer = "\n</pre></table><br>"
 # Chapter header/inter/footer.
 #
 chapter_header = '<br><table align=center width="75%"><tr><td><h2>'
-chapter_inter  = "</h2><ul>"
-chapter_footer = "</ul></td></tr></table>"
+chapter_inter  = '</h2><ul class="empty"><li>'
+chapter_footer = '</li></ul></td></tr></table>'
 
 
 # source language keyword coloration/styling
@@ -152,9 +154,9 @@ class HtmlFormatter(Formatter):
         self.html_header   = html_header_1 + project_title + html_header_2 + \
                              project_title + html_header_3
 
-        self.html_footer = "<p><center><font size=""-2"">generated on " +   \
+        self.html_footer = "<center><font size=""-2"">generated on " +   \
                             time.asctime( time.localtime( time.time() ) ) + \
-                           "</font></p></center>" + html_footer
+                           "</font></center>" + html_footer
 
         self.columns = 3
 
@@ -387,7 +389,6 @@ class HtmlFormatter(Formatter):
         print chapter_header + '<a href="' + index_filename + '">Global Index</a>' + chapter_inter + chapter_footer
 
     def  toc_exit( self ):
-        print "</table>"
         print self.html_footer
 
     def  toc_dump( self, toc_filename = None, index_filename = None ):
