diff --git a/ChangeLog b/ChangeLog
index 4fd7864d3..fb3436f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-11-27  Werner Lemberg  <wl@gnu.org>
+
+	* src/tools/docmaker/tohtml.py: More HTML table refactoring.
+
+	Replace some `<table>' tags with `<div>' to simplify structure.
+
+	Move `bgcolor' attribute to CSS.
+
+	Replace most `width' attributes with CSS.  The remaining instances
+	(providing a similar effect as LaTeX's `\hfill' command) are removed
+	in a later patch.
+
 2014-11-27  Werner Lemberg  <wl@gnu.org>
 
 	* src/tools/docmaker/tohtml.py: Replace <font> with CSS.
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 2b31371f7..6a45aace2 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -43,6 +43,10 @@ html_header_2 = """\
          color: #000000;
          background: #FFFFFF; }
 
+  div.indent1 { width: 87%;
+                margin: auto; }
+  div.indent2 { width: 75%;
+                margin: auto; }
   div.timestamp { text-align: center;
                   font-size: 69%; }
 
@@ -60,6 +64,7 @@ html_header_2 = """\
                  color: darkblue; }
 
   table.center { margin: auto; }
+  table.fill { width: 100%; }
 
   td { padding: 0 0.5em 0 0.5em; }
   td.left { padding: 0 0.5em 0 0.5em;
@@ -69,6 +74,9 @@ html_header_2 = """\
   td.tiny { padding: 0 0.5em 0 0.5em;
             font-size: 69%; }
 
+  tr.mark { background-color: #EEEEFF; }
+  tr.code { background-color: #D6E8FF; }
+
   ul.empty { list-style-type: none; }
 </style>
 </head>
@@ -125,11 +133,10 @@ para_header = "<p>"
 para_footer = "</p>"
 
 # Block header and footer.
-block_header        = '<table class="center" width="75%"><tr><td>'
+block_header        = '<div class="indent2">'
 block_footer_start  = """\
-</td></tr></table>
-<hr width="75%">
-<table class="center" width="75%"><tr><td class="small">[<a href="\
+<hr>
+<table><tr><td class="small">[<a href="\
 """
 block_footer_middle = """\
 ">Index</a>]</td>
@@ -137,30 +144,30 @@ block_footer_middle = """\
 <td class="small">[<a href="\
 """
 block_footer_end    = """\
-">TOC</a>]</td></tr></table>
+">TOC</a>]</td></tr></table></div>
 """
 
 # Description header/footer.
-description_header = '<table class="center" width="87%"><tr><td>'
-description_footer = "</td></tr></table><br>"
+description_header = '<div class="indent1">'
+description_footer = "</div><br>"
 
 # Marker header/inter/footer combination.
-marker_header = '<table class="center" width="87%" cellpadding="5"><tr bgcolor="#EEEEFF"><td><em><b>'
+marker_header = '<div class="indent1"><table class="fill" cellpadding="5"><tr class="mark"><td><em><b>'
 marker_inter  = "</b></em></td></tr><tr><td>"
-marker_footer = "</td></tr></table>"
+marker_footer = "</td></tr></table></div>"
 
 # Header location header/footer.
-header_location_header = '<table class="center" width="87%"><tr><td>'
-header_location_footer = "</td></tr></table><br>"
+header_location_header = '<div class="indent1">'
+header_location_footer = "</div><br>"
 
 # Source code extracts header/footer.
-source_header = '<table class="center" width="87%"><tr bgcolor="#D6E8FF"><td><pre>\n'
-source_footer = "\n</pre></td></tr></table><br>"
+source_header = '<div class="indent1"><table class="fill"><tr class="code"><td><pre>\n'
+source_footer = "\n</pre></td></tr></table></div><br>"
 
 # Chapter header/inter/footer.
-chapter_header = '<br><table class="center" width="75%"><tr><td><h2>'
+chapter_header = '<br><div class="indent2"><h2>'
 chapter_inter  = '</h2><ul class="empty"><li>'
-chapter_footer = '</li></ul></td></tr></table>'
+chapter_footer = '</li></ul></div>'
 
 # Index footer.
 index_footer_start = """\