diff --git a/config/01-plugins.vim b/config/01-plugins.vim
index a0f2e0b..ed8a4e4 100644
--- a/config/01-plugins.vim
+++ b/config/01-plugins.vim
@@ -16,7 +16,12 @@ if(have_plug)
     Plug 'ctrlpvim/ctrlp.vim'             " Fuzzy search
     Plug 'editorconfig/editorconfig-vim'  " EditorConfig.org support
     Plug 'ivyl/vim-bling'                 " blink search results
-    Plug 'rking/ag.vim'                   " Silver Searcher Support
+    if executable('ag')
+        Plug 'rking/ag.vim'               " Silver Searcher Support
+    endif
+    if executable('rg')
+        Plug 'jremmen/vim-ripgrep'        " RipGrep
+    endif
     Plug 'tacahiroy/ctrlp-funky'          " Fuzzy in-buffer search
     Plug 'tommcdo/vim-lion'               " Align stuff
     Plug 'tpope/vim-commentary'           " Commenting
diff --git a/config/04-autocmds.vim b/config/04-autocmds.vim
index e1169ae..d2698bd 100644
--- a/config/04-autocmds.vim
+++ b/config/04-autocmds.vim
@@ -107,8 +107,15 @@
      let g:ctrlp_user_command = 'ag %s -l --nocolor -f -g ""'
      let g:ctrlp_use_caching = 0
  else
-     "ctrl+p ignore files in .gitignore
-     let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . -co --exclude-standard', 'find %s -type f']
+     if executable("rg")
+         set grepprg=rg\ --color=never
+
+         let g:ctrlp_user_command = 'rg %s --files --color=never --glob ""'
+         let g:ctrlp_use_caching = 0
+     else
+         "ctrl+p ignore files in .gitignore
+         let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . -co --exclude-standard', 'find %s -type f']
+     endif
  endif
 
  if has("gui_running")