diff --git a/ChangeLog b/ChangeLog
index cb15dd37f..1ce87d6f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-27  Werner Lemberg  <wl@gnu.org>
+
+	[docmaker] Replace `name' attribute of `<a>' with `id'.
+
+	* src/tools/docmaker/tohtml.py (HtmlFormatter::block_enter): Do it.
+
 2014-11-27  Werner Lemberg  <wl@gnu.org>
 
 	* src/tools/docmaker/tohtml.py: Remove remaining `width' attributes.
diff --git a/src/tools/docmaker/tohtml.py b/src/tools/docmaker/tohtml.py
index e2759d882..609f83223 100644
--- a/src/tools/docmaker/tohtml.py
+++ b/src/tools/docmaker/tohtml.py
@@ -558,8 +558,7 @@ class  HtmlFormatter( Formatter ):
 
         # place html anchor if needed
         if block.name:
-            print( '<h4><a name="' + block.name + '">'
-                   + block.name + '</a></h4>' )
+            print( '<h4 id="' + block.name + '">' + block.name + '</h4>' )
 
         # dump the block C source lines now
         if block.code: