diff --git a/vim/vimrc b/vim/vimrc
index 7ec5402..ee6d0c3 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -193,6 +193,10 @@ nnoremap <Down> :echomsg "use j"<cr>
 nnoremap <Left> :echomsg "use j"<cr>
 nnoremap <Right> :echomsg "use l"<cr>
 
+" And spell-checking
+autocmd FileType gitcommit setlocal spell
+set complete+=kspell
+
 " Keymap to open NERDtree
 map <C-n> :NERDTreeToggle<cr>
 " Autoclose when NERDtree is the last buffer