diff --git a/Makefile b/Makefile
index 8ee1262..9a81e4e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ CLI_DEPENDENCIES := \
 	aur/zsh-fast-syntax-highlighting-git \
 	community/bat \
 	community/fd \
+	community/fzf \
 	community/git-lfs \
 	community/lesspipe \
 	community/mosh \
diff --git a/bash/.bashrc b/bash/.bashrc
index 4229b42..20114b1 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -61,4 +61,7 @@ source ~/.profile
 source ~/.bash_prompt
 
 # Use fzf for backwards search
-[ -f ~/.fzf.bash ] && source ~/.fzf.bash
+source /usr/share/fzf/key-bindings.bash
+
+# Enable fzf completion
+source /usr/share/fzf/completion.bash
diff --git a/vim/.vimrc b/vim/.vimrc
index 0e8415f..4702845 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -94,8 +94,6 @@ Plug 'tpope/vim-git'
 Plug 'tpope/vim-fugitive'
 " Show git messages in preview window
 Plug 'rhysd/git-messenger.vim'
-" Fuzzy file finder (installs zfz system-wide)
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 " Pre-written functions for fzf mappings
 Plug 'junegunn/fzf.vim'
 " Rust syntax, folding, compiler etc...
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 611eb0a..d461034 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -112,4 +112,7 @@ source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.
 source ~/.zsh_prompt
 
 # Use fzf for backwards search
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+source /usr/share/fzf/key-bindings.zsh
+
+# Enable completions for fzf
+source /usr/share/fzf/completion.zsh