diff --git a/.vimrc b/.vimrc
index 65fb4ec..2737c7c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -21,7 +21,11 @@ call vundle#begin()
     Plugin 'vim-scripts/nginx.vim'
     Plugin 'wincent/terminus'
     Plugin 'Xuyuanp/nerdtree-git-plugin'
-    Plugin 'ajh17/VimCompletesMe.git'
+    if has('nvim')
+        Plugin 'Shougo/deoplete.nvim'
+    else
+        Plugin 'ajh17/VimCompletesMe'
+    endif
 call vundle#end()
 
 filetype plugin indent on
@@ -33,6 +37,7 @@ let load_doxygen_syntax = 1
 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
 set encoding=utf-8
 set icon
 set smartcase