diff --git a/.gitattributes b/.gitattributes
index 183fdcaaa9a..13debfd97e9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 
 *.[cCh] whitespace=indent-with-non-tab,space-before-tab,trailing-space
 *.cc whitespace=indent-with-non-tab,space-before-tab,trailing-space
+ChangeLog whitespace=indent-with-non-tab,space-before-tab,trailing-space
diff --git a/ChangeLog b/ChangeLog
index bff525fe8fd..9ddc7032609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-21  Jason Merrill  <jason@redhat.com>
+
+	* .gitattributes: Also check ChangeLog whitespace.
+
 2019-10-21  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* contrib/dg-extract-results.sh: Add support for KPASS.