diff --git a/src/shell/lisa_shell b/src/shell/lisa_shell
index 3687eb0c48ba514bb10fe59ffdbb7cc8712bc02f..e954f969c280f8ba3343d83b1a88006485437fc1 100755
--- a/src/shell/lisa_shell
+++ b/src/shell/lisa_shell
@@ -245,6 +245,16 @@ echo
 echo
 }
 
+function lisa-check-submods {
+local missing=0
+if [ ! -f ./libs/devlib/setup.py ] ||
+   [ ! -f ./libs/bart/setup.py ] ||
+   [ ! -f ./libs/trappy/setup.py ]; then
+	echo "One or more submodules missing, updating";
+	lisa-update submodules
+fi
+}
+
 ################################################################################
 # LISA Tests utility functions
 ################################################################################
@@ -351,6 +361,8 @@ Type "lisa-help" for on-line help on available commands
 
 EOF
 
+lisa-check-submods
+
 # Setup default SHELL text color
 echo -e "$LISASHELL_DEFAULT"