diff --git a/ChangeLog b/ChangeLog
index 383838478..63cfaa0e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 	* src/tools/docmaker/content.py (re_field): Allow `.' in field names
 	(but not at the beginning or end).
 	* src/tools/docmaker/tohtml.py (html_header_1): Use `utf-8' charset.
+	(block_footer): Split into...
+	(block_footer_start, block_footer_middle, block_footer_end): This to
+	add navigation buttons.
+	(HtmlFormatter::block_exit): Updated.
 
 	* include/freetype/*: Many minor documentation improvements (adding
 	links, spelling errors, etc.).
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index f011aaf99..bf4f60922 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -70,8 +70,20 @@ para_footer = "</p>"
 
 # Block header and footer.
 #
-block_header = '<table align=center width="75%"><tr><td>'
-block_footer = '</td></tr></table><hr width="75%">'
+block_header        = '<table align=center width="75%"><tr><td>'
+block_footer_start  = """\
+</td></tr></table>
+<hr width="75%">
+<table align=center width="75%"><tr><td><font size=-2>[<a href="
+"""
+block_footer_middle = """\
+">Index</a>]</font></td>
+<td width="100%"></td>
+<td><font size=-2>[<a href="
+"""
+block_footer_end    = """\
+">TOC</a>]</font></td></tr></table>
+"""
 
 # Description header/footer.
 #
@@ -493,7 +505,9 @@ class HtmlFormatter(Formatter):
             print marker_footer
 
     def  block_exit( self, block ):
-        print block_footer
+        print block_footer_start + self.file_prefix + "index.html" + \
+              block_footer_middle + self.file_prefix + "toc.html" + \
+              block_footer_end
 
 
     def  section_exit( self, section ):