diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 5053a09..59a7123 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -141,3 +141,11 @@ endif
 
 " Options for vimoutliner
 autocmd Filetype votl setlocal sts=4
+
+" Highlight whitespace at end of file
+highlight ExtraWhitespace ctermbg=red guibg=red
+autocmd Syntax * syn match ExtraWhitespace /\s\+$\| \+\ze\t/ containedin=ALL
+
+" Color column at end of lines
+set colorcolumn=+1
+highlight ColorColumn ctermbg=lightgrey guibg=lightgrey