diff --git a/.vimrc b/.vimrc
index 8e3b9fa..25d0c8d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -281,12 +281,16 @@ inoremap {;<CR> {<CR>};<ESC>O
 " ---------------------------------------------------------------------------------------------------------------------
 " ==> Spellcheck 
 
-"     Toggle spell check highlights with <F10>
-nnoremap <F10> :setlocal spell! spelllang=en_us<CR>
-
 "     auto-complete spelling suggestions with <ctrl-p>
 set complete+=kspell
 
+autocmd FileType markdown setlocal complete+=kspell
+autocmd FileType text setlocal complete+=kspell
+autocmd FileType gitcommit setlocal complete+=kspell
+
+"     Toggle spell check highlights with <F10>
+nnoremap <F10> :setlocal spell! spelllang=en_us<CR>
+
 " ==> Spellcheck: only certain file types
 "     https://robots.thoughtbot.com/vim-spell-checking
 
@@ -303,6 +307,7 @@ autocmd BufRead,BufNewFile *.md setlocal spell
 autocmd BufRead,BufNewFile *.txt setlocal spell
 
 " ==> Spellcheck Colors
+"
 "     I hate spellcheck's default colors
 "     (http://stackoverflow.com/questions/6008921/how-do-i-change-the-highlight-style-in-vim-spellcheck)
 "     Vim Colors: (http://alvinalexander.com/linux/vi-vim-editor-color-scheme-syntax)