diff --git a/vimrc b/vimrc
index b3d906d..fc33bac 100644
--- a/vimrc
+++ b/vimrc
@@ -74,9 +74,9 @@ set ttyfast                             " Improve redrawing in xterm
 filetype indent plugin on               " Identify file type
 set wildignore+=*/tmp/*,*.so,*.swp      " Files to ignore
 
-set shiftwidth=4                        " Tab
-set tabstop=4                           "
-set noexpandtab                         "
+set shiftwidth=2                        " Tab
+set tabstop=2                           "
+set expandtab                           "
 
 set number                              " Line numbering
 set autoindent                          " Indentation