diff --git a/.gitmodules b/.gitmodules
index 5c8a7dc..fdba5a3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "zsh-syntax-highlighting"]
 	path = zsh-syntax-highlighting
 	url = https://github.com/zsh-users/zsh-syntax-highlighting
+[submodule "fzf"]
+	path = fzf
+	url = https://github.com/junegunn/fzf
diff --git a/fzf b/fzf
new file mode 160000
index 0000000..6654239
--- /dev/null
+++ b/fzf
@@ -0,0 +1 @@
+Subproject commit 6654239c94667fefb38d76cfc47b6abf5ced8149
diff --git a/zshrc b/zshrc
index 357fcb7..a2d8a54 100644
--- a/zshrc
+++ b/zshrc
@@ -645,6 +645,11 @@ autoload -Uz zmv
 if [[ -d ${ZDOTDIR:-$HOME}/.zsh/zsh-syntax-highlighting ]]; then
 	source ${ZDOTDIR:-$HOME}/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 fi
+if command-exists fzf && [[ -d ${ZDOTDIR:-$HOME}/.zsh/fzf ]]; then
+	source ${ZDOTDIR:-$HOME}/.zsh/fzf/shell/completion.zsh
+	source ${ZDOTDIR:-$HOME}/.zsh/fzf/shell/key-bindings.zsh
+fi
+
 
 #---------------------------------- Machine specific --------------------------