diff --git a/.gitignore b/.gitignore
index 05345a717..581c3bfcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,7 @@
 /tools/tsan_suppressions
 /tools/valgrind
 /tools/win
+/tools/whitespace.txt
 /webrtc/examples/android/media_demo/bin
 /webrtc/examples/android/media_demo/gen
 /webrtc/examples/android/media_demo/libs
diff --git a/tools/whitespace.txt b/tools/whitespace.txt
new file mode 100644
index 000000000..87c7d8274
--- /dev/null
+++ b/tools/whitespace.txt
@@ -0,0 +1,9 @@
+You can modify this file to create no-op changelists.
+
+Try to write something funny. And please don't add trailing whitespace.
+
+
+Whitespaces are cool.
+
+
+Really cool.