diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..b38d7f1b43bebd2645a4ddaea2ed6659ca8a34e9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.{c,C,cc,h} whitespace=indent-with-non-tab,space-before-tab,trailing-space
diff --git a/ChangeLog b/ChangeLog
index 92f017cf6b07552917bce2f57fe1be24049ca404..3b0f3d0c460c5fab0e69d5ed1c6b54d7aa572d71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-22  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* .gitattributes: New file.
+
 2016-04-22  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* MAINTAINERS (rs6000/powerpc port): Add myself.
diff --git a/gcc/testsuite/.gitattributes b/gcc/testsuite/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..562b12e16ebc543db80629d8bcf9499f7a16e74f
--- /dev/null
+++ b/gcc/testsuite/.gitattributes
@@ -0,0 +1 @@
+* -whitespace
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1fef88cf84bd8be35cc1f4e6a5607d09b2a693f4..6ffb14ecdf0ce48c2375cfcca623e534b4fd8cd3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-22  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* .gitattributes: New file.
+
 2016-04-22  Christophe Lyon  <christophe.lyon@linaro.org>
 
 	* lib/gcc-dg.exp (${tool}_load): Add default return value handler.