diff --git a/vimrc b/vimrc
index eb42f30..30fd094 100644
--- a/vimrc
+++ b/vimrc
@@ -19,3 +19,6 @@ let g:netrw_banner=0
 " Tree style listing in netrw
 let g:netrw_liststyle = 3
 
+" Automatically remove trailing whitespace
+autocmd! BufWrite * mark ' | silent! %s/\s\+$// | norm '
+