diff --git a/.gitmodules b/.gitmodules
index 3fdba2113..aa3814711 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "custom/plugins/zsh-syntax-highlighting"]
 	path = custom/plugins/zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "plugins/bazel"]
+	path = plugins/bazel
+	url = https://github.com/jackwish/bazel.git
diff --git a/plugins/bazel b/plugins/bazel
new file mode 160000
index 000000000..b9e2a2d8b
--- /dev/null
+++ b/plugins/bazel
@@ -0,0 +1 @@
+Subproject commit b9e2a2d8b96bb4b0d49e1ed9a327a6df890334c3
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index f90ba00c1..4cac23407 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -49,7 +49,7 @@ ZSH_THEME="kphoen"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git zsh-syntax-highlighting history-substring-search terminalapp)
+plugins=(git zsh-syntax-highlighting history-substring-search terminalapp bazel)
 
 # User configuration