diff --git a/ci/release/build.sh b/ci/release/build.sh
index 82da752e3..82f930a51 100755
--- a/ci/release/build.sh
+++ b/ci/release/build.sh
@@ -1,7 +1,12 @@
 #!/bin/sh
 set -eu
+if [ ! -e "$(dirname "$0")/../../ci/sub/.git" ]; then
+  set -x
+  git submodule update --init
+  set +x
+fi
+. "$(dirname "$0")/../../ci/sub/lib.sh"
 cd -- "$(dirname "$0")/../.."
-. ./ci/sub/lib.sh
 
 help() {
   cat <<EOF
diff --git a/make.sh b/make.sh
index c05c8b678..60a938426 100755
--- a/make.sh
+++ b/make.sh
@@ -7,6 +7,6 @@ if [ ! -e "$(dirname "$0")/ci/sub/.git" ]; then
 fi
 . "$(dirname "$0")/ci/sub/lib.sh"
 PATH="$(cd -- "$(dirname "$0")" && pwd)/ci/sub/bin:$PATH"
-cd "$(dirname "$0")"
+cd -- "$(dirname "$0")"
 
 _make "$@"