diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..d9785fad00
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+*.gemspec diff=ruby
+*.rb diff=ruby
+bin/* diff=ruby
+tool/update-deps diff=ruby
+tool/make-snapshot diff=ruby
diff --git a/ChangeLog b/ChangeLog
index 360494473f..ce4ce44944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 20 06:52:53 2015  Eric Wong  <e@80x24.org>
+
+	* .gitattributes: new file for git users
+	  [ruby-core:71578] [Feature #11713]
+
 Thu Nov 19 22:35:31 2015  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/ancdata.c: Check buffer full and ignore MSG_TRUNC flag.