diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 01bcc8f..1cfdb0d 100644
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -33,12 +33,15 @@ let g:syntastic_cpp_compiler="g++"
 let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
 
 autocmd Filetype python setlocal expandtab
-autocmd Filetype markdown setlocal textwidth=72
+autocmd Filetype markdown setlocal textwidth=72 expandtab
 
 " Remove trailing whitespace, always.
 autocmd BufWritePre * :%s/\s\+$//e
 
 " Keep backup files etc out of the way
+set undofile
+set undolevels=1000
+set undoreload=10000
 set undodir=~/.cache/vim/undo " vim will not create this directory.
 set directory=~/.cache/vim/swap " vim will not create this directory.
 set backupdir=~/.cache/vim/backup " vim will not create this directory.