diff --git a/doc/_ext/flashrom_authors.py b/doc/_ext/flashrom_authors.py
index f160d21e1..ff23a5547 100644
--- a/doc/_ext/flashrom_authors.py
+++ b/doc/_ext/flashrom_authors.py
@@ -1,3 +1,4 @@
+import collections
 from docutils import nodes
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -13,17 +14,14 @@ class FlashromAuthorsDirective(SphinxDirective):
     required_arguments = 1
     has_content = True
 
-    def make_table(self, list_file: Path):
+    def make_table(self, name_counts):
         body = nodes.tbody()
-        with list_file.open("r") as f:
-            for line in f:
-                count, _, name = line.strip().partition("\t")
-
-                body += nodes.row(
-                    "",
-                    nodes.entry("", nodes.paragraph(text=name)),
-                    nodes.entry("", nodes.paragraph(text=count)),
-                )
+        for name, count in name_counts:
+            body += nodes.row(
+                "",
+                nodes.entry("", nodes.paragraph(text=name)),
+                nodes.entry("", nodes.paragraph(text=str(count))),
+            )
 
         return nodes.table(
             "",
@@ -68,7 +66,40 @@ class FlashromAuthorsDirective(SphinxDirective):
             self.state.nested_parse(self.content, 0, container)
             return [self.make_placeholder(container.children)]
         else:
-            return [self.make_table(Path(list_file))]
+            authors = self.count_authors_from_file(Path(list_file))
+            return [self.make_table(authors.most_common())]
+
+    @classmethod
+    def count_authors_from_file(cls, list_file: Path) -> collections.Counter:
+        # Correcting names may influence the count, so although git shortlog
+        # provides us a count there may be multiple entries in the file that
+        # must be combined into a single row.
+        counter = collections.Counter()
+
+        with list_file.open("r") as f:
+            for line in f:
+                count, _, name = line.strip().partition("\t")
+                fixed_name = cls._correct_known_bad_name(name)
+                if fixed_name is not None:
+                  counter[fixed_name] += int(count)
+
+        return counter
+
+    _INCORRECT_NAMES = {
+        # Commit 9ff3d4cf759161edf6c163f454f11bc9f5328ce3 is missing a '>' in a
+        # Co-Authored-By trailer, but this person is already credited as author
+        # of that commit so should not be double-counted.
+        "persmule <persmule@hardenedlinux.org": None,
+    }
+
+    @classmethod
+    def _correct_known_bad_name(cls, name: str):
+        """
+        Return a corrected form of the provided name if it's known to be
+        incorrect and should be modified, or None if the name should be
+        ignored.  Otherwise, return the provided name.
+        """
+        return cls._INCORRECT_NAMES.get(name, name)
 
 
 def setup(app: Sphinx) -> 'ExtensionMetadata':