diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..b38d7f1b43b
--- /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 92f017cf6b0..3b0f3d0c460 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 00000000000..562b12e16eb
--- /dev/null
+++ b/gcc/testsuite/.gitattributes
@@ -0,0 +1 @@
+* -whitespace
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1fef88cf84b..6ffb14ecdf0 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.