diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 7b61bb8915b9aa36b8fab970d5cf287865fdd536..64a0db18e58ffd16951d5bb64d9ff48bd3d59cae 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-22  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc-changelog/git_commit.py: Add trailing / to
+	gcc/testsuite/go.test/test and replace gcc/go/frontend/
+	with gcc/go/gofrontend/ in ignored locations.
+
 2020-05-22  Martin Liska  <mliska@suse.cz>
 
 	* gcc-changelog/git_commit.py: Add gcc/testsuite/go.test/test
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index ba9f5ce96509fba38a7e9a838c75bf65b0c85016..8c5fa2c0fc935d9fab8466f059fcf81a2539960d 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -127,8 +127,8 @@ bug_components = set([
 
 ignored_prefixes = [
     'gcc/d/dmd/',
-    'gcc/go/frontend/',
-    'gcc/testsuite/go.test/test',
+    'gcc/go/gofrontend/',
+    'gcc/testsuite/go.test/test/',
     'libgo/',
     'libphobos/libdruntime',
     'libphobos/src/',