diff --git a/vimrc b/vimrc
index 93bef66fe9cdb311697d30a830e1191dd86cc80d..31d7cf4414b31550f3dd23df50656eaaa05a7c3c 100644
--- a/vimrc
+++ b/vimrc
@@ -25,8 +25,8 @@ filetype plugin on      " Enable the filetype plugin
 " Tab options
 set expandtab           " Soft tabs, changes tabs to spaces
 set tabstop=4           " Number of spaces in a tab
-set softtabstop=4       " Number of spaces in a soft tab
-set shiftwidth=4        " Number of spaces in an indentation level.
+set softtabstop=0       " Number of spaces in a soft tab. 0 is disabled
+set shiftwidth=4        " Number of spaces in an indentation level
 
 
 " Searching options