diff --git a/README.mdown b/README.mdown
index 18e24393..5eab0f4f 100644
--- a/README.mdown
+++ b/README.mdown
@@ -175,10 +175,10 @@ Showing the pydoc is by default on `K` If you want to change that:
 
     let g:jedi#pydoc = "K"
 
-If you are a person who likes to use VIM-tabs not buffers, you might want to
+If you are a person who likes to use VIM-buffers not tabs, you might want to
 put that in your `.vimrc`:
 
-    let g:jedi#use_tabs_not_buffers = 1
+    let g:jedi#use_tabs_not_buffers = 0
 
 Jedi automatically starts the completion, if you type a dot, e.g. `str.`, if
 you don't want this:
diff --git a/plugin/jedi.vim b/plugin/jedi.vim
index 5bfcecf9..f5fdf81e 100644
--- a/plugin/jedi.vim
+++ b/plugin/jedi.vim
@@ -297,7 +297,7 @@ endfunc
 
 " defaults for jedi-vim
 if !exists("g:jedi#use_tabs_not_buffers ")
-    let g:jedi#use_tabs_not_buffers = 0
+    let g:jedi#use_tabs_not_buffers = 1
 endif
 if !exists("g:jedi#auto_initialization")
     let g:jedi#auto_initialization = 1