diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..c1ddf8a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+# Run this to make 'git diff' on texinfo files give nicer hunk context:
+#   git config diff.texinfo.funcname '^@node[	 ][	 ]*\\([^,][^,]*\\)'
+*.texi*	diff=texinfo
+
+# Run this to make 'git diff' on .m4 files give nicer hunk context:
+#   git config diff.m4.xfuncname '^((AC_DEFUN|m4_define)[^,)]*)'
+*.m4	diff=m4