diff --git a/bootstrap b/bootstrap
index 4a11e8648..90cb51332 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,13 +8,11 @@ if ! git --version >/dev/null; then
 fi
 
 
-git submodule update --init
+echo "$0: Updating submodules"
+echo | git submodule update --init
 
 ./contrib/gana-update.sh
 
-
-./contrib/gana.sh
-
 # This is more portable than `which' but comes with
 # the caveat of not(?) properly working on busybox's ash:
 existence()
diff --git a/contrib/gana.sh b/contrib/gana.sh
index 0475d7ffb..30dc7994e 100755
--- a/contrib/gana.sh
+++ b/contrib/gana.sh
@@ -6,3 +6,5 @@ set -eu
 cd contrib/gana
 git pull origin master
 cd ../..
+
+exec ./contrib/gana-update.sh