diff --git a/.gitattributes b/.gitattributes
index f6df8bb..8a6c64b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -284,3 +284,4 @@
 WebKitTools/WinLauncher/WinLauncher.vcproj -crlf
 WebKitTools/record-memory-win/main.cpp -crlf
 WebKitTools/record-memory-win/record-memory-win.vcproj -crlf
+WebKitTools/TestResultServer/index.yaml -crlf
diff --git a/ChangeLog b/ChangeLog
index de386b9..e5206f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-16  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Add WebKitTools/TestResultServer/index.yaml to gitattributes to ignore for crlf conversion.
+
+        * .gitattributes:
+
 2010-03-12  Scott Byer  <scottbyer@chromium.org>
 
         Reviewed by David Levin.