diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..c0bb3fe0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+debian/changelog merge=dpkg-mergechangelogs
+
+#  ~/.gitconfig should have
+# [merge "dpkg-mergechangelogs"]
+# name = debian/changelog merge driver
+# driver = dpkg-mergechangelogs -m %O %A %B %A