diff --git a/Makefile b/Makefile
index 05f179624..a7cc378b7 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,11 @@ include .config.mk
 
 .PHONY: dist
 dist:
-	$(git-archive-all) --include ./configure taler-wallet-$(shell git describe --tags --abbrev=0).tar.gz
+	$(git-archive-all) \
+	       	--include ./configure \
+	       	--include ./packages/taler-wallet-cli/configure \
+	       	--include ./packages/demobank-ui/configure \
+	       	taler-wallet-$(shell git describe --tags --abbrev=0).tar.gz
 
 # Create tarball with git hash prefix in name
 .PHONY: dist-git
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 355a31726..23538677f 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 355a3172699b96f1040edcb577c07a681802b3ae
+Subproject commit 23538677f6c6be2a62f38dc6137ecdd1c76b7b15