diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5c8a7dc
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "zsh-syntax-highlighting"]
+	path = zsh-syntax-highlighting
+	url = https://github.com/zsh-users/zsh-syntax-highlighting
diff --git a/zsh-syntax-highlighting b/zsh-syntax-highlighting
new file mode 160000
index 0000000..a33c72e
--- /dev/null
+++ b/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit a33c72e8389b3d984d25fd556d86878777c76571
diff --git a/zshrc b/zshrc
index bb9ce23..ca93d5f 100644
--- a/zshrc
+++ b/zshrc
@@ -612,6 +612,12 @@ for command in find wget git; \
 # load zsh extended move
 autoload -Uz zmv
 
+#---------------------------------- Addons ------------------------------------
+
+if [[ -d ${ZDOTDIR:-$HOME}/.zsh/zsh-syntax-highlighting ]]; then
+	source ${ZDOTDIR:-$HOME}/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi
+
 #---------------------------------- Machine specific --------------------------
 
 if [[ -r $HOME/.zlocal ]]; then