diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index 90e908e375c6..b28f7deac230 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -416,7 +416,7 @@ class GitCommit:
                 self.errors.append(Error('trailing whitespace', line))
             if len(line.replace('\t', ' ' * TAB_WIDTH)) > LINE_LIMIT:
                 # support long filenames
-                if not line.startswith('\t* ') or not line.endswith(':'):
+                if not line.startswith('\t* ') or not line.endswith(':') or ' ' in line[3:-1]:
                     self.errors.append(Error('line exceeds %d character limit'
                                              % LINE_LIMIT, line))
             m = changelog_regex.match(line)