diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..e8495d51
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
diff --git a/ChangeLog b/ChangeLog
index 04d364a2..268e3692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-16  Eric Blake  <ebb9@byu.net>
+
+	Make ChangeLog merges easier.
+	* .gitattributes: New file.
+	* HACKING: Mention how it helps.
+
 2008-04-15  Peter O'Gorman  <peter@pogma.com>
 
 	Allow bootstrap from git repository.
diff --git a/HACKING b/HACKING
index da95e7e0..778eab1c 100644
--- a/HACKING
+++ b/HACKING
@@ -191,6 +191,8 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
 	* NEWS: Updated.
 	Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
 
+* You may find it useful to install the git-merge-changelog merge driver:
+  http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c
 
 6. Editing `.am' Files
 ======================