diff --git a/.vimrc b/.vimrc
index ea0807aa..f10630d3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -70,7 +70,9 @@ au BufNewFile,BufRead *.py " Set up nice PEP8 indentation
 au BufNewFile,BufRead *.html,*.php
 	\ set tabstop=2 |
 	\ set softtabstop=2 |
-	\ set shiftwidth=2
+	\ set shiftwidth=2 |
+	\ set autoindent |
+	\ set smartindent
 " Treat PHP like HTML
 au BufNewFile,BufRead *.php
 	\ set filetype=html