diff --git a/ChangeLog b/ChangeLog
index cf1b97bfe..42bfa15dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
 	but use a new <span> class.
 	(section_synopsis_header, section_synopsis_footer): Don't change
 	colour.
+	(code_header, code_footer): Don't change font colour directly but
+	use a special <pre> class.
 	(print_html_field): <tr> gets the `valign' attribute, not <table>.
 	(print_html_field_list): Ditto.
 	(index_exit): Don't use <center>...</center> but `align=center'
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index 7f08e8d92..f5c3c541d 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -32,6 +32,8 @@ html_header_2= """ API Reference</title>
                  text-align: left;
                  white-space: pre;
                  color: darkblue; }
+
+  pre.colored { color: blue; }
 </style>
 </head>
 <body>
@@ -55,8 +57,8 @@ section_title_footer = "</h1></center>"
 
 # The header and footer used for code segments.
 #
-code_header = "<font color=blue><pre>"
-code_footer = "</pre></font>"
+code_header = '<pre class="colored">'
+code_footer = '</pre>'
 
 # Paragraph header and footer.
 #
