diff --git a/.gitattributes b/.gitattributes
index 94ef0ab2d..57cd0fd86 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+.travis.yml export-ignore
 /build_tools/make_svn_completions.fish export-ignore
 /build_tools/description-pak export-ignore
 /build_tools/make_hg_completions.fish export-ignore
diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh
index a044d2f25..4f02411bd 100755
--- a/build_tools/make_tarball.sh
+++ b/build_tools/make_tarball.sh
@@ -30,7 +30,7 @@ path=~/fish_built/$prefix.tar
 rm -f "$path" "$path".gz
 
 # git starts the archive
-git archive --format=tar --prefix="$prefix"/ master > "$path"
+git archive --format=tar --prefix="$prefix"/ HEAD > "$path"
 
 # tarball out the documentation, generate a configure script and version file
 # Don't use autoreconf since it invokes commands that may not be installed, like aclocal