diff --git a/vim/.vimrc b/vim/.vimrc
index cd43237..56b9816 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -19,7 +19,7 @@ syntax enable
 command! MakeTags !ctags -R .
 
 " 4 spaces instead of tabs indentation
-set shiftwidth=4 tabstop=4 softtabstop=4 expandtab 
+set shiftwidth=4 tabstop=4 softtabstop=4 expandtab
 
 " Fold methods based on indents
 " zo to open folds, zc to close
@@ -60,7 +60,7 @@ set autochdir
 set hls
 
 "Search as characters are entered
-set incsearch 
+set incsearch
 
 "Line for linewrapping
 set colorcolumn=80
@@ -83,6 +83,9 @@ set cursorline
 "Activate statusbar
 set laststatus=2
 
+"Remove trailing spaces on save
+autocmd BufWritePre * :%s/\s\+$//e
+
 "Copy to clipboard
 vnoremap y "+y
 vnoremap x "+x
@@ -93,7 +96,7 @@ vnoremap c "+c
 " Nerdtree
 map <C-e> :NERDTreeToggle<CR>
 
-" Airline 
+" Airline
 let g:airline_theme = 'distinguished'
 let g:airline_section_y = '%{hostname()}'
 let g:airline_section_b = '%{fugitive#statusline()}'