diff --git a/docs/bin/find-plugin-refs.py b/docs/bin/find-plugin-refs.py
index 427c1cbbf87..dee8ce68c9c 100755
--- a/docs/bin/find-plugin-refs.py
+++ b/docs/bin/find-plugin-refs.py
@@ -38,7 +38,7 @@ def plugin_names(topdir):
 
 def process_refs(topdir, plugin_names):
     REF_RE = re.compile(':ref:`([^`]*)`')
-    LABEL_RE = re.compile('<[^>]*>`$')
+    LABEL_RE = re.compile('<([^>]*)>$')
 
     # Walk the whole docs tree looking for :ref:.  Anywhere those are found, search for `([^`]*)`
     for dirpath, dirnames, filenames in os.walk(topdir):
diff --git a/docs/bin/plugin_formatter.py b/docs/bin/plugin_formatter.py
index 12a034f62e9..62c42ca70eb 100755
--- a/docs/bin/plugin_formatter.py
+++ b/docs/bin/plugin_formatter.py
@@ -91,7 +91,7 @@ def rst_ify(text):
     try:
         t = _ITALIC.sub(r"*\1*", text)
         t = _BOLD.sub(r"**\1**", t)
-        t = _MODULE.sub(r":ref:`\1 <\1>`", t)
+        t = _MODULE.sub(r":ref:`\1 <\1_module>`", t)
         t = _LINK.sub(r"`\1 <\2>`_", t)
         t = _URL.sub(r"\1", t)
         t = _CONST.sub(r"`\1`", t)