diff --git a/.vimrc b/.vimrc
index cc75390..0d8b983 100644
--- a/.vimrc
+++ b/.vimrc
@@ -21,14 +21,16 @@ call vundle#begin()
     Plugin 'vim-scripts/nginx.vim'
     Plugin 'wincent/terminus'
     Plugin 'Xuyuanp/nerdtree-git-plugin'
-    if has('nvim')
-        Plugin 'Shougo/deoplete.nvim'
-        Plugin 'Shougo/deoplete-clangx'
-        Plugin 'wokalski/autocomplete-flow'
-        Plugin 'deoplete-plugins/deoplete-jedi'
-    else
-        Plugin 'ajh17/VimCompletesMe'
-    endif
+    Plugin 'Shougo/deoplete.nvim'
+    Plugin 'Shougo/neoinclude.vim'
+    Plugin 'wokalski/autocomplete-flow'
+    Plugin 'deoplete-plugins/deoplete-jedi'
+    Plugin 'deoplete-plugins/deoplete-clang'
+    Plugin 'deoplete-plugins/deoplete-docker'
+    if !has('nvim')
+        Plugin 'roxma/nvim-yarp'
+        Plugin 'roxma/vim-hug-neovim-rpc'
+  endif
 call vundle#end()
 
 filetype plugin indent on
@@ -41,6 +43,8 @@ let g:airline_theme='solarized'
 let g:airline_solarized_bg='dark'
 let g:airline#extensions#tabline#enabled = 1
 let g:deoplete#enable_at_startup = 1
+let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-default/lib/libclang.so.1'
+let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-default/lib/clang/default/include'
 set encoding=utf-8
 set icon
 set smartcase