diff --git a/.vim/vimrc b/.vim/vimrc
index 7aa3502..2264133 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -95,6 +95,8 @@ au BufNewFile,BufRead *.sls set shiftwidth=2
 au BufNewFile,BufRead *.mk set noexpandtab
 au BufNewFile,BufRead *.psgi setf perl
 au BufNewFile,BufRead *.rb set shiftwidth=2
+au BufNewFile,BufRead *.yaml set shiftwidth=2
+au BufNewFile,BufRead *.yml set shiftwidth=2
 au BufNewFile,BufRead Makefile set noexpandtab
 au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm '\"")|else|exe "norm $"|endif|endif
 autocmd BufEnter * silent! lcd %:p:h