diff --git a/.gitattributes b/.gitattributes
index 56a55c603f0c3..741c4d53b5a03 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -25,3 +25,7 @@ objc/*.h diff=objcppheader
 # For best performance, place rules for deep paths in the parent directory.
 # For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,
 # place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes
+
+# Exclude these git specific files from archives created via git-archive.
+.gitignore      export-ignore
+.gitattributes  export-ignore
diff --git a/ChangeLog b/ChangeLog
index 161696deb9119..40199d5ec9931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-29  Thiago Macieira  <thiago.macieira@intel.com>
+
+        Tell git-archive to not export .gitattributes and .gitignore
+
+        Reviewed by Simon Hausmann.
+
+        Exclude git specific files from archives created via git-archive.
+
+        * .gitattributes:
+
 2012-08-28  Mario Sanchez Prada  <msanchez@igalia.com>
 
         Add directory generated by Eclipse to .gitignore