diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 084e83c18cc..e2be3843c83 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -20,110 +20,149 @@ import os
 import re
 
 changelog_locations = set([
+    'bfd',
+    'binutils',
     'config',
     'contrib',
-    'contrib/header-tools',
-    'contrib/reghunt',
-    'contrib/regression',
-    'fixincludes',
-    'gcc/ada',
-    'gcc/analyzer',
-    'gcc/brig',
-    'gcc/c',
-    'gcc/c-family',
-    'gcc',
-    'gcc/cp',
-    'gcc/d',
-    'gcc/fortran',
-    'gcc/go',
-    'gcc/jit',
-    'gcc/lto',
-    'gcc/objc',
-    'gcc/objcp',
-    'gcc/po',
-    'gcc/testsuite',
-    'gnattools',
-    'gotools',
+    'cpu',
+    'elfcpp',
+    'etc',
+    'gas',
+    'gdb',
+    'gdb/doc',
+    'gdbserver',
+    'gdb/stubs',
+    'gdbsupport',
+    'gdb/testsuite',
+    'gnulib',
+    'gold',
+    'gprof',
     'include',
+    'include/gdb',
     'intl',
-    'libada',
-    'libatomic',
-    'libbacktrace',
-    'libcc1',
-    'libcpp',
-    'libcpp/po',
+    'ld',
+    'libctf',
     'libdecnumber',
-    'libffi',
-    'libgcc',
-    'libgcc/config/avr/libf7',
-    'libgcc/config/libbid',
-    'libgfortran',
-    'libgomp',
-    'libhsail-rt',
     'libiberty',
-    'libitm',
-    'libobjc',
-    'liboffloadmic',
-    'libphobos',
-    'libquadmath',
-    'libsanitizer',
-    'libssp',
-    'libstdc++-v3',
-    'libvtv',
-    'lto-plugin',
-    'maintainer-scripts',
-    'zlib'])
+    'opcodes',
+    'readline',
+    'readline/readline/examples/rlfe',
+    'sim/aarch64',
+    'sim/arm',
+    'sim/avr',
+    'sim/bfin',
+    'sim',
+    'sim/common',
+    'sim/cr16',
+    'sim/cris',
+    'sim/d10v',
+    'sim/erc32',
+    'sim/frv',
+    'sim/ft32',
+    'sim/h8300',
+    'sim/igen',
+    'sim/iq2000',
+    'sim/lm32',
+    'sim/m32c',
+    'sim/m32r',
+    'sim/m68hc11',
+    'sim/mcore',
+    'sim/microblaze',
+    'sim/mips',
+    'sim/mn10300',
+    'sim/moxie',
+    'sim/msp430',
+    'sim/ppc',
+    'sim/pru',
+    'sim/rl78',
+    'sim/rx',
+    'sim/sh64',
+    'sim/sh',
+    'sim/testsuite',
+    'sim/testsuite/d10v-elf',
+    'sim/testsuite/frv-elf',
+    'sim/testsuite/m32r-elf',
+    'sim/testsuite/mips64el-elf',
+    'sim/testsuite/sim/aarch64',
+    'sim/testsuite/sim/arm',
+    'sim/testsuite/sim/avr',
+    'sim/testsuite/sim/bfin',
+    'sim/testsuite/sim/cr16',
+    'sim/testsuite/sim/cris',
+    'sim/testsuite/sim/fr30',
+    'sim/testsuite/sim/frv',
+    'sim/testsuite/sim/ft32',
+    'sim/testsuite/sim/h8300',
+    'sim/testsuite/sim/iq2000',
+    'sim/testsuite/sim/lm32',
+    'sim/testsuite/sim/m32c',
+    'sim/testsuite/sim/m32r',
+    'sim/testsuite/sim/m68hc11',
+    'sim/testsuite/sim/mcore',
+    'sim/testsuite/sim/microblaze',
+    'sim/testsuite/sim/mips',
+    'sim/testsuite/sim/mn10300',
+    'sim/testsuite/sim/moxie',
+    'sim/testsuite/sim/msp430',
+    'sim/testsuite/sim/or1k',
+    'sim/testsuite/sim/pru',
+    'sim/testsuite/sim/sh64',
+    'sim/testsuite/sim/sh64/compact',
+    'sim/testsuite/sim/sh64/media',
+    'sim/testsuite/sim/sh',
+    'sim/testsuite/sim/v850',
+    'sim/v850',
+    'zlib'
+])
 
 bug_components = set([
+    # GDB components
     'ada',
-    'analyzer',
-    'boehm-gc',
-    'bootstrap',
-    'c',
+    'backtrace',
+    'breakpoints',
+    'build',
     'c++',
+    'cli',
+    'compile',
+    'corefiles',
     'd',
-    'debug',
-    'demangler',
-    'driver',
-    'fastjar',
+    'exp',
+    'external',
     'fortran',
-    'gcov-profile',
+    'gdb',
     'go',
-    'hsa',
-    'inline-asm',
-    'ipa',
+    'guile',
+    'i18n',
     'java',
-    'jit',
-    'libbacktrace',
-    'libf2c',
-    'libffi',
-    'libfortran',
-    'libgcc',
-    'libgcj',
-    'libgomp',
-    'libitm',
-    'libobjc',
-    'libquadmath',
-    'libstdc++',
-    'lto',
-    'middle-end',
-    'modula2',
+    'm2',
+    'm3',
+    'macros',
+    'mi',
     'objc',
-    'objc++',
-    'other',
-    'pch',
-    'pending',
-    'plugins',
-    'preprocessor',
-    'regression',
-    'rtl-optimization',
-    'sanitizer',
-    'spam',
-    'target',
+    'pascal',
+    'python',
+    'record',
+    'remote',
+    'rust',
+    'server',
+    'shlibs',
+    'sim',
+    'symtab',
+    'tdep',
     'testsuite',
-    'translation',
-    'tree-optimization',
-    'web'])
+    'threads',
+    'tui',
+    'varobj',
+    'web',
+    'win32',
+    # Binutils components
+    'admin',
+    'binutils',
+    'gas',
+    'gold',
+    'gprof',
+    'ld',
+    'libctf'])
 
 ignored_prefixes = [
     'gcc/d/dmd/',