diff --git a/docs/_includes/links.html b/docs/_includes/links.html
index 4f99e9422e..004229987a 100644
--- a/docs/_includes/links.html
+++ b/docs/_includes/links.html
@@ -4,10 +4,12 @@
 {% for entry in site.data.sidebars[sidebar].entries %}
 {% for folder in entry.folders %}
 {% for folderitem in folder.folderitems %}
+{% if folderitem.url %}
 {% if folderitem.url contains "html#" %}
-[{{folderitem.url | remove: "/" }}]: {{folderitem.url | remove: "/"}}
+[{{ folderitem.url | remove: "/" }}]: PageAnchorLink {{folderitem.url | remove: "/"}}
 {% else %}
-[{{folderitem.url | remove: "/"  | remove: ".html"}}]: {{folderitem.url | remove: "/"}}
+[{{ folderitem.url | remove: "/" | remove: ".html" }}]: {{ folderitem.url | remove: "/" }}
+{% endif %}
 {% endif %}
 {% for subfolders in folderitem.subfolders %}
 {% for subfolderitem in subfolders.subfolderitems %}
diff --git a/pmd-doc/src/main/java/net/sourceforge/pmd/docs/RuleDocGenerator.java b/pmd-doc/src/main/java/net/sourceforge/pmd/docs/RuleDocGenerator.java
index 963655d775..46fc856f32 100644
--- a/pmd-doc/src/main/java/net/sourceforge/pmd/docs/RuleDocGenerator.java
+++ b/pmd-doc/src/main/java/net/sourceforge/pmd/docs/RuleDocGenerator.java
@@ -262,8 +262,8 @@ public class RuleDocGenerator {
                                     .replace("${language.tersename}", languageTersename)
                                     .replace("${ruleset.name}", RuleSetUtils.getRuleSetFilename(ref.getRuleSetReference().getRuleSetFileName()));
 
-                            rules.append("[").append(ref.getRule().getName()).append("](");
-                            rules.append(otherLink).append("#").append(ref.getName().toLowerCase(Locale.ROOT)).append(")");
+                            rules.append("[").append(ref.getName()).append("](");
+                            rules.append(otherLink).append("#").append(ref.getRule().getName().toLowerCase(Locale.ROOT)).append(")");
                         } else {
                             rules.append(rule.getName());
                         }
diff --git a/pmd-doc/src/test/resources/expected/java.md b/pmd-doc/src/test/resources/expected/java.md
index c8c7dbc1b4..6f0ffef371 100644
--- a/pmd-doc/src/test/resources/expected/java.md
+++ b/pmd-doc/src/test/resources/expected/java.md
@@ -29,5 +29,5 @@ folder: pmd/rules
 
     It contains the following rules:
 
-    [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer), [OverrideBothEqualsAndHashcode](pmd_rules_java_sample.html#overridebothequalsandhashcode)
+    [JumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer), [OldNameOfJumbledIncrementer](pmd_rules_java_sample.html#jumbledincrementer), [OverrideBothEqualsAndHashcode](pmd_rules_java_sample.html#overridebothequalsandhashcode)
 
diff --git a/pmd-doc/src/test/resources/rulesets/ruledoctest/sample-deprecated.xml b/pmd-doc/src/test/resources/rulesets/ruledoctest/sample-deprecated.xml
index ee458fe862..8dc148e5f7 100644
--- a/pmd-doc/src/test/resources/rulesets/ruledoctest/sample-deprecated.xml
+++ b/pmd-doc/src/test/resources/rulesets/ruledoctest/sample-deprecated.xml
@@ -11,4 +11,7 @@ Sample ruleset which only contains deprecated rule references.
     <rule ref="rulesets/ruledoctest/sample.xml/OverrideBothEqualsAndHashcode" deprecated="true" />
     <rule ref="rulesets/ruledoctest/sample.xml/JumbledIncrementer" deprecated="true" />
 
+    <!-- both moved and renamed: -->
+    <rule ref="rulesets/ruledoctest/sample.xml/JumbledIncrementer" name="OldNameOfJumbledIncrementer" deprecated="true" />
+
 </ruleset>