diff --git a/.fzf.zsh b/.fzf.zsh
new file mode 100644
index 0000000..e8dcb8f
--- /dev/null
+++ b/.fzf.zsh
@@ -0,0 +1,13 @@
+# Setup fzf
+# ---------
+if [[ ! "$PATH" == */home/linuxbrew/.linuxbrew/opt/fzf/bin* ]]; then
+  export PATH="${PATH:+${PATH}:}/home/linuxbrew/.linuxbrew/opt/fzf/bin"
+fi
+
+# Auto-completion
+# ---------------
+[[ $- == *i* ]] && source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/completion.zsh" 2> /dev/null
+
+# Key bindings
+# ------------
+source "/home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh"
diff --git a/makefile b/makefile
index 2718fcb..6af7240 100644
--- a/makefile
+++ b/makefile
@@ -20,6 +20,13 @@ setup_git:
 	git config --global user.email "dth@taiga.ai"
 	git config --global pull.rebase false
 
+setup_fzf:
+	echo "make sure /home/linuxbrew/.linuxbrew/opt/fzf/bin exists"
+	echo "make sure /home/linuxbrew/.linuxbrew/opt/fzf/shell/completion.zsh exists"
+	echo "make sure /home/linuxbrew/.linuxbrew/opt/fzf/shell/key-bindings.zsh exists"
+	ln -s -f ~/dotfiles/.fzf.zsh ~/.fzf.zsh
+
+
 setup_vimwiki1:
 	rm -rf ~/.local/share/nvim/vimwiki/
 	git clone git@github.com:DannyDannyDanny/vimwiki.git ~/vimwiki/