diff --git a/jedi b/jedi
index f9595d7..f6d2fdc 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit f9595d789788cfd74be75315fbf71f295fe6439e
+Subproject commit f6d2fdcf592e89b0bb96fb61cd4f7bd557dc91c5
diff --git a/plugin/jedi.vim b/plugin/jedi.vim
index cc2dcc6..998618e 100644
--- a/plugin/jedi.vim
+++ b/plugin/jedi.vim
@@ -57,6 +57,10 @@ endif
 set switchbuf=useopen  " needed for pydoc
 let s:current_file=expand("<sfile>")
 
+if g:jedi#auto_initialization 
+    autocmd FileType python setlocal omnifunc=jedi#complete
+endif
+
 python << PYTHONEOF
 """ here we initialize the jedi stuff """
 import vim