diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 87ecb9e1a17..1df5b1d42a9 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -111,6 +111,7 @@ bug_components = {
     'libfortran',
     'libgcc',
     'libgcj',
+    'libgdiagnostics',
     'libgomp',
     'libitm',
     'libobjc',
@@ -130,6 +131,7 @@ bug_components = {
     'rtl-optimization',
     'rust',
     'sanitizer',
+    'sarif-replay',
     'spam',
     'target',
     'testsuite',