diff --git a/.gitattributes b/.gitattributes
index bf16a71493..d66b5737ca 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -38,9 +38,13 @@ configure.in eol=lf
 # Ignore changes in the generated files.
 build/upmake    -diff
 
-# Don't include stuff which is only used with Git in the archives.
+# Don't include stuff which is only useful when using Git and CI (which is only
+# used with the actual repository and never the archives).
+.circleci/                      export-ignore
+.cirrus.yml                     export-ignore
 .github/                        export-ignore
 .gitattributes                  export-ignore
 .gitignore                      export-ignore
 .gitmodules                     export-ignore
+.mailmap                        export-ignore
 appveyor.yml                    export-ignore