diff --git a/.gitattributes b/.gitattributes
index d8106c2..0685791 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,8 @@
 
 # ignore Makefile for distribution archives
 /Makefile export-ignore
+
+# ignore .gitignore and this file (the .gitignore files in subdirectories
+# are not really used, but just a way to track empty directories)
+.gitignore export-ignore
+.gitattributes export-ignore
diff --git a/Makefile b/Makefile
index c58f3a2..2c0c85a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,11 @@ dist: dist-tar dist-zip
 
 dist-zip:
 	@rm -f easyrpg-rtp.zip
-	@git archive --prefix=EasyRPG-RTP/ -9 --output=$(MYDIR)/easyrpg-rtp.zip master
+	@git archive --prefix=EasyRPG-RTP/ -9 --output=$(MYDIR)/easyrpg-rtp.zip --worktree-attributes master
 
 dist-tar:
 	@rm -f easyrpg-rtp.tar.gz
-	@git archive --prefix=EasyRPG-RTP/ --output=$(MYDIR)/easyrpg-rtp.tar.gz master
+	@git archive --prefix=EasyRPG-RTP/ --output=$(MYDIR)/easyrpg-rtp.tar.gz --worktree-attributes master
 
 optimize: optimize-png