diff --git a/templates/vimrc.j2 b/templates/vimrc.j2
index a5de6b3..d339153 100644
--- a/templates/vimrc.j2
+++ b/templates/vimrc.j2
@@ -109,7 +109,7 @@ autocmd BufNewFile,BufRead *.md set ft=markdown
 autocmd FileType css,scss,less set tabstop=4 shiftwidth=4 softtabstop=0 smarttab   noexpandtab nolist textwidth=0
 autocmd FileType javascript    set tabstop=4 shiftwidth=4 softtabstop=0 smarttab   noexpandtab nolist textwidth=0
 autocmd FileType markdown      set tabstop=4 shiftwidth=4 softtabstop=0 nosmarttab expandtab   list   textwidth=0
-autocmd FileType haml          set tabstop=2 shiftwidth=2 softtabstop=0 nosmarttab expandtab   list   textwidth=0
+autocmd FileType haml,yaml     set tabstop=2 shiftwidth=2 softtabstop=0 nosmarttab expandtab   list   textwidth=0
 autocmd FileType xhtml,html    set tabstop=4 shiftwidth=4 softtabstop=0 smarttab   noexpandtab nolist textwidth=0
 autocmd FileType c             set tabstop=4 shiftwidth=4 softtabstop=0 smarttab   noexpandtab nolist textwidth=0
 autocmd FileType cpp           set tabstop=4 shiftwidth=4 softtabstop=0 smarttab   noexpandtab nolist textwidth=0