diff --git a/.gitignore b/.gitignore
index 0dff3b85a..8fb67e2a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ build-scripts/
 # Git worktree of pre-built wallet files
 prebuilt/
 
+
+taler-wallet-*.tar.gz
diff --git a/build-system/Makefile b/build-system/Makefile
index ba565fc4f..6bd29884e 100644
--- a/build-system/Makefile
+++ b/build-system/Makefile
@@ -7,6 +7,11 @@ typedoc = node_modules/typedoc/bin/typedoc
 ava = node_modules/.bin/ava
 nyc = node_modules/nyc/bin/nyc.js
 
+git-archive-all = ./build-system/taler-build-scripts/archive-with-submodules/git_archive_all.py
+
+
+version := $(shell git describe --tags)
+
 include ./build-system/config.mk
 
 .PHONY: compile
@@ -16,7 +21,7 @@ compile:
 
 .PHONY: dist
 dist:
-	git archive --format=tar.gz HEAD -o taler-wallet.tar.gz
+	$(git-archive-all) --include ./configure taler-wallet-$(version).tar.gz
 
 # make documentation from docstrings
 .PHONY: typedoc
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index c76fb9b3a..31081f442 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit c76fb9b3af6ec43f2d2a83e6b4f523dcc5ac6a54
+Subproject commit 31081f44232d0233629ad3a4d398322da9958ed4