diff --git a/dotfiles/vim.org b/dotfiles/vim.org
index 0bafd66..35b3abc 100644
--- a/dotfiles/vim.org
+++ b/dotfiles/vim.org
@@ -76,6 +76,14 @@
   Plug 'morhetz/gruvbox'         " Retro groove color scheme for Vim
 #+END_SRC
 
+** Language Server Protocol
+#+begin_src conf
+  Plug 'autozimu/LanguageClient-neovim', {
+      \ 'branch': 'next',
+      \ 'do': 'bash install.sh',
+      \ }
+#+end_src
+
 ** Snippnets and autocompletion
 #+BEGIN_SRC conf
   Plug 'SirVer/ultisnips'   " The ultimate snippet solution for Vim
@@ -712,6 +720,19 @@ endfunction
 autocmd! User FzfStatusLine call <SID>fzf_statusline()
 #+END_SRC
 
+** autozimu/LanguageClient-neovim
+#+begin_src conf
+  let g:LanguageClient_serverCommands = {
+      \ 'matlab': ['java', ' -Djava.library.path=$MATLABROOT/bin/glnxa64 -cp $MATLABROOT/extern/engines/java/jar/engine.jar:$MATLABROOT/java/jar/jmi.jar:/home/thomas/github/matlab-langserver/build/libs/lsp-matlab-0.1.jar org.tokor.lspmatlab.Application'],
+      \ }
+
+  nnoremap <F5> :call LanguageClient_contextMenu()<CR>
+  " Or map each action separately
+  nnoremap <silent> K :call LanguageClient#textDocument_hover()<CR>
+  nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
+  nnoremap <silent> <F2> :call LanguageClient#textDocument_rename()<CR>
+#+end_src
+
 ** JamshedVesuna/vim-markdown-preview
 #+BEGIN_SRC conf
 let vim_markdown_preview_github=1