diff --git a/Makefile b/Makefile
index f77669c1..03cb0de9 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ help: ## Shows this help
 
 update: ## Update crowsnest (fetches and pulls repository changes)
 	@git fetch && git pull
+	bash -c 'tools/update.sh'
 
 report: ## Generate report.txt
 	@if [ -f ~/report.txt ]; then rm -f ~/report.txt; fi
diff --git a/bin/build.sh b/bin/build.sh
index b4ee2cc4..14a129ef 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -214,7 +214,10 @@ main() {
 }
 
 #### MAIN
-main "${@}"
-exit 0
+
+if [[ "${BASH_SOURCE[0]}" = "${0}" ]]; then
+    main "${@}"
+    exit 0
+fi
 
 #### EOF