diff --git a/.gitmodules b/.gitmodules
index e22a4baa..2c0f107b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
 [submodule "nvim/.config/nvim/pack/opt/gruvbox"]
 	path = nvim/.config/nvim/pack/bundle/opt/gruvbox
 	url = https://github.com/morhetz/gruvbox.git
+[submodule "nvim/.config/nvim/pack/bundle/opt/fzf.vim"]
+	path = nvim/.config/nvim/pack/bundle/opt/fzf.vim
+	url = https://github.com/junegunn/fzf.vim
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index cf611bcd..8fc81d41 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -3,6 +3,7 @@ let maplocalleader = "\\"
 
 if has('packages')
 	packadd! gruvbox
+	packadd! fzf.vim
 endif
 
 " Enables filetype detection as well as filetype specific indent rules and
diff --git a/nvim/.config/nvim/pack/bundle/opt/fzf.vim b/nvim/.config/nvim/pack/bundle/opt/fzf.vim
new file mode 160000
index 00000000..3348aef0
--- /dev/null
+++ b/nvim/.config/nvim/pack/bundle/opt/fzf.vim
@@ -0,0 +1 @@
+Subproject commit 3348aef05d02828cd8b071ab29476af2029ea3d3
diff --git a/nvim/.config/nvim/plugin/fzf.vim b/nvim/.config/nvim/plugin/fzf.vim
new file mode 100644
index 00000000..06b8ce29
--- /dev/null
+++ b/nvim/.config/nvim/plugin/fzf.vim
@@ -0,0 +1,8 @@
+" Prefixes all of the fzf commands
+let g:fzf_command_prefix = 'Fzf'
+" Mappings for common Fzf commands
+nnoremap <leader>f = :FzfFiles<cr>
+nnoremap <leader>b = :FzfBuffers<cr>
+nnoremap <leader>h = :FzfHelptags<cr>
+" The space is important at the end of this mapping
+nnoremap <leader>/ = :FzfRg