diff --git a/.gitmodules b/.gitmodules
index 5b671eb..49cbf98 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "config/awesome/vicious"]
 	path = config/awesome/vicious
 	url = http://git.sysphere.org/vicious/
+[submodule "zsh/syntax-highlighting"]
+	path = zsh/syntax-highlighting
+	url = git://github.com/nicoulaj/zsh-syntax-highlighting.git
diff --git a/zsh/syntax-highlighting b/zsh/syntax-highlighting
new file mode 160000
index 0000000..ea792cb
--- /dev/null
+++ b/zsh/syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit ea792cbf87248c81fe8b3551f6b362832495815e
diff --git a/zshrc b/zshrc
index d54d631..a706643 100644
--- a/zshrc
+++ b/zshrc
@@ -79,3 +79,5 @@ bindkey "\e0F"   end-of-line
 ## for freebsd console
 bindkey "\e[H"   beginning-of-line
 bindkey "\e[F"   end-of-line
+
+source ~/.zsh/syntax-highlighting/zsh-syntax-highlighting.zsh