diff --git a/.gitignore b/.gitignore
index d62595f7..80cadc7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
+**/node_modules
 .keys
+.zsign_cache/
+db.*
+deps/ios_toolchain/
 deps/openssl/
+dist/
 geckodriver.log
 out
-**/node_modules
-db.*
diff --git a/GNUmakefile b/GNUmakefile
index 2e2bee24..0bffd4cd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -843,11 +843,10 @@ clean:
 .PHONY: clean
 
 dist: release-apk iosrelease-ipa
-	@echo "[export] $$(svn info --show-item url)"
-	@rm -rf tildefriends-$(VERSION_NUMBER)
-	@svn export -q . tildefriends-$(VERSION_NUMBER)
-	@echo "tildefriends-$(VERSION_NUMBER): $(VERSION_NAME)" > tildefriends-$(VERSION_NUMBER)/VERSION
-	@echo "[tar] tildefriends-$(VERSION_NUMBER).tar.xz"
+	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
+	@rm -rf out/tildefriends-$(VERSION_NUMBER)
+	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
+	@git archive main | tar -x -C out/tildefriends-$(VERSION_NUMBER)
 	@tar \
 		--exclude=apps/gg* \
 		--exclude=apps/welcome* \
@@ -864,14 +863,14 @@ dist: release-apk iosrelease-ipa
 		--exclude=deps/sqlite/shell.c \
 		--exclude=deps/zlib/contrib/vstudio \
 		--exclude=deps/zlib/doc \
-		-caf tildefriends-$(VERSION_NUMBER).tar.xz tildefriends-$(VERSION_NUMBER)
-	@rm -rf tildefriends-$(VERSION_NUMBER)
+		-caf dist/tildefriends-$(VERSION_NUMBER).tar.xz out/tildefriends-$(VERSION_NUMBER)
+	#@rm -rf out/tildefriends-$(VERSION_NUMBER)
 	@echo "[cp] TildeFriends-x86-$(VERSION_NUMBER).apk"
-	@cp out/TildeFriends-x86-release.apk TildeFriends-x86-$(VERSION_NUMBER).apk
+	@cp out/TildeFriends-x86-release.apk dist/TildeFriends-x86-$(VERSION_NUMBER).apk
 	@echo "[cp] TildeFriends-arm-$(VERSION_NUMBER).apk"
-	@cp out/TildeFriends-arm-release.apk TildeFriends-arm-$(VERSION_NUMBER).apk
+	@cp out/TildeFriends-arm-release.apk dist/TildeFriends-arm-$(VERSION_NUMBER).apk
 	@echo "[cp] TildeFriends-$(VERSION_NUMBER).ipa"
-	@cp out/tildefriends-release.ipa TildeFriends-$(VERSION_NUMBER).ipa
+	@cp out/tildefriends-release.ipa dist/TildeFriends-$(VERSION_NUMBER).ipa
 .PHONY: dist
 
 dist-test: dist