diff --git a/.gitattributes b/.gitattributes
index 878221f9b..7d6d029fa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,3 +12,5 @@ configure        crlf=input
 *.dsw           -crlf
 *.sln           -crlf
 *.vcproj        -crlf
+
+debian/changelog merge=dpkg-mergechangelogs