diff --git a/utils/generate_release_notes.py b/utils/generate_release_notes.py
index 11d6e80cb45..9b8ed442f30 100755
--- a/utils/generate_release_notes.py
+++ b/utils/generate_release_notes.py
@@ -89,7 +89,14 @@ def print_category(category, changes, file=None):
     overflow = []
     max_section_length = 25
     for item in sorted(items):
+        # Relies on author being specified after the last "by".
         author = item.rsplit(" by ", maxsplit=1)[-1]
+        # Relies on author being specified as username.
+        if " " in author:
+            author = author.split(" ", maxsplit=1)[0]
+        if author.startswith("@"):
+            # We expect that to be always the case, but we test anyway.
+            author = author[1:]
         if author in known_bot_names or author.endswith("[bot]"):
             hidden.append(item)
         elif len(visible) > max_section_length:
@@ -98,7 +105,7 @@ def print_category(category, changes, file=None):
             visible.append(item)
     for item in visible:
         print(f"* {item}", file=file)
-    if hidden:
+    if hidden or overflow:
         print("\n<details>")
         print(" <summary>Show more</summary>\n")
         for item in itertools.chain(overflow, hidden):
diff --git a/utils/known_bot_names.txt b/utils/known_bot_names.txt
index 99a0ff600bc..68d2c69cacb 100644
--- a/utils/known_bot_names.txt
+++ b/utils/known_bot_names.txt
@@ -1 +1,3 @@
 osgeoweblate
+renovate
+github-actions