diff --git a/plugin/jedi.vim b/plugin/jedi.vim
index 0c96819..6d40db8 100644
--- a/plugin/jedi.vim
+++ b/plugin/jedi.vim
@@ -5,13 +5,15 @@
 " the Jedi Python library.
 
 
-" jedi-vim doesn't work in compatible mode (vim script syntax problems)
-if &compatible
-    set nocompatible
-endif
+if g:jedi#auto_vim_configuration
+    " jedi-vim doesn't work in compatible mode (vim script syntax problems)
+    if &compatible
+        set nocompatible
+    endif
 
-" jedi-vim really needs, otherwise jedi-vim cannot start.
-filetype plugin on
+    " jedi-vim really needs, otherwise jedi-vim cannot start.
+    filetype plugin on
+endif
 
 " Pyimport command
 command! -nargs=1 -complete=custom,jedi#py_import_completions Pyimport :call jedi#py_import(<q-args>)