diff --git a/vimrc b/vimrc
index 0f2f9aa..89d383c 100644
--- a/vimrc
+++ b/vimrc
@@ -113,12 +113,12 @@ endif
 " Settings based on feature detection.
 
 if has("autocmd")
-	autocmd BufRead,BufNewFile *.go set shiftwidth=8 tabstop=8
-	autocmd BufRead,BufNewFile *.html set shiftwidth=2
-	autocmd BufRead,BufNewFile *.md set filetype=markdown tabstop=4
-	autocmd BufRead,BufNewFile *.opml set shiftwidth=2
-	autocmd BufRead,BufNewFile *.xml set shiftwidth=2
-	autocmd BufRead,BufNewFile *.yml set shiftwidth=2
+	autocmd BufRead,BufNewFile *.go set noexpandtab shiftwidth=8 tabstop=8
+	autocmd BufRead,BufNewFile *.html set expandtab shiftwidth=2
+	autocmd BufRead,BufNewFile *.md set filetype=markdown shiftwidth=4
+	autocmd BufRead,BufNewFile *.opml set expandtab shiftwidth=2
+	autocmd BufRead,BufNewFile *.xml set expandtab shiftwidth=2
+	autocmd BufRead,BufNewFile *.yml set expandtab shiftwidth=2
 endif
 
 if has("folding")