diff --git a/gitprompt.sh b/gitprompt.sh
index 98b9381..1a164da 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -475,6 +475,7 @@ function updatePrompt() {
 
   export __GIT_PROMPT_IGNORE_STASH=${GIT_PROMPT_IGNORE_STASH}
   export __GIT_PROMPT_SHOW_UPSTREAM=${GIT_PROMPT_SHOW_UPSTREAM}
+  export __GIT_PROMPT_IGNORE_SUBMODULES=${GIT_PROMPT_IGNORE_SUBMBODULES}
 
   if [ -z "${GIT_PROMPT_SHOW_UNTRACKED_FILES}" ]; then
     export __GIT_PROMPT_SHOW_UNTRACKED_FILES=all
diff --git a/gitstatus.sh b/gitstatus.sh
index 9ec99ce..7f36df4 100755
--- a/gitstatus.sh
+++ b/gitstatus.sh
@@ -15,7 +15,13 @@ if [ -z "${__GIT_PROMPT_DIR}" ]; then
   __GIT_PROMPT_DIR="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 fi
 
-gitstatus=$( LC_ALL=C git status --untracked-files=${__GIT_PROMPT_SHOW_UNTRACKED_FILES:-all} --porcelain --branch )
+if [[ "${__GIT_PROMPT_IGNORE_SUBMODULES}" == "1" ]]; then
+  _ignore_submodules=--ignore-submodules
+else
+  _ignore_submodules=
+fi
+
+gitstatus=$( LC_ALL=C git status ${_ignore_submodules} --untracked-files=${__GIT_PROMPT_SHOW_UNTRACKED_FILES:-all} --porcelain --branch )
 
 # if the status is fatal, exit now
 [[ "$?" -ne 0 ]] && exit 0