diff --git a/.gitignore b/.gitignore
index 72ea3f3bcd..2d7f2df978 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,23 @@
 /conf/*.local.conf
 /conf/acl.auth.php
 /conf/local.php
+/conf/local.protected.php
 /conf/users.auth.php
-/conf/userstyle.css
+/conf/user*.css
+/conf/user*.js
 /conf/words.aspell
+.htaccess
+*.swp
+*.bak
+*.old
+*~
+/data/attic/*
+/data/cache/*
+/data/index/*
+/data/locks/*
+/data/media/*
+/data/meta/*
+/data/pages/*
+/data/tmp/*
+/lib/tpl/*
+/lib/plugins/*