diff --git a/.gitignore b/.gitignore
index 6841414751..52a98f192f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 # Upload/save dirs
 /upload/
 /save/
+/tmp/
 # For setup script
 /config/
 # ctags
@@ -22,8 +23,9 @@ phpmyadmin.wpj
 .idea
 .netbeans
 *.sw[op]
-# IIS files
+# Web server files
 web.config
+.htaccess
 # Locales
 /locale/
 # Backups