diff --git a/.vimrc b/.vimrc
index d137b60..349452d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,4 @@
 set nocompatible              " be iMproved, required
-filetype off                  " required
 
 syntax enable
 set tabstop=4
@@ -39,6 +38,11 @@ Plugin 'jiangmiao/auto-pairs'
 
 call vundle#end()
 
+let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
+execute "set rtp+=" . g:opamshare . "/merlin/vim"
+execute "set rtp+=" . g:opamshare . "/vim/syntax/ocp-indent.vim"
+let g:syntastic_ocaml_checkers = ['merlin']
+
 " YouCompleteMe python fix
 let g:ycm_server_python_interpreter = '/usr/bin/python3'
 
diff --git a/.zshrc b/.zshrc
index e289796..ba82348 100644
--- a/.zshrc
+++ b/.zshrc
@@ -84,3 +84,6 @@ ZSH_HIGHLIGHT_STYLES[assign]='none'
 ZSH_HIGHLIGHT_STYLES[redirection]='none'
 
 source $DOTFILES/aliases
+
+# OPAM configuration
+. /home/frebib/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true