diff --git a/vim/vimrc b/vim/vimrc
index b285a32..4d5cbca 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -24,7 +24,8 @@ imap <F5> <Esc>:update<CR>:make<CR>
 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
+autocmd Filetype python setlocal expandtab
+autocmd Filetype markdown setlocal textwidth=79
 
 " Remove trailing whitespace, always.
 autocmd BufWritePre * :%s/\s\+$//e