diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4c6ca4b36be..7b5ffced911 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-16  Jonathan Wakely  <jwakely@redhat.com>
+
+	* doc/xml/manual/appendix_contributing.xml: Link to the list of bad
+	identifiers.
+	* doc/html/*: Regenerate.
+
 2017-05-15  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/80761
diff --git a/libstdc++-v3/doc/html/manual/source_code_style.html b/libstdc++-v3/doc/html/manual/source_code_style.html
index 790276f3f5c..e17530c1763 100644
--- a/libstdc++-v3/doc/html/manual/source_code_style.html
+++ b/libstdc++-v3/doc/html/manual/source_code_style.html
@@ -478,7 +478,7 @@
       Examples: <code class="code">_S_max_elements  _S_default_value</code><br />
 <br />
       Don't use names in the same scope that differ only in the prefix,<br />
-      e.g. _S_top and _M_top. See BADNAMES for a list of forbidden names.<br />
+      e.g. _S_top and _M_top. See <a class="link" href="source_code_style.html#coding_style.bad_identifiers" title="Bad Identifiers">BADNAMES</a> for a list of forbidden names.<br />
       (The most tempting of these seem to be and "_T" and "__sz".)<br />
 <br />
       Names must never have "__" internally; it would confuse name<br />
diff --git a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
index dbc671e698e..f5b759ac518 100644
--- a/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
+++ b/libstdc++-v3/doc/xml/manual/appendix_contributing.xml
@@ -898,7 +898,7 @@ indicate a place that may require attention for multi-thread safety.
       Examples: <code>_S_max_elements  _S_default_value</code>
 
       Don't use names in the same scope that differ only in the prefix,
-      e.g. _S_top and _M_top. See BADNAMES for a list of forbidden names.
+      e.g. _S_top and _M_top. See <link linkend="coding_style.bad_identifiers">BADNAMES</link> for a list of forbidden names.
       (The most tempting of these seem to be and "_T" and "__sz".)
 
       Names must never have "__" internally; it would confuse name