diff --git a/vim/vimrc b/vim/vimrc
index ad324fd..b285a32 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -25,3 +25,6 @@ let g:syntastic_cpp_compiler="g++"
 let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
 
 autocmd Filetype python setlocal expandtab tabstop=4 shiftwidth=4
+
+" Remove trailing whitespace, always.
+autocmd BufWritePre * :%s/\s\+$//e