diff --git a/.gitignore b/.gitignore
index 64816ba380b17025f279c998e461ee2c9fc410fd..bb39ba7cf6b011a3875a25b80594da199a27b92a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /conf/lang/*
 /conf/plugin_lang/*
 /conf/plugins.local.*
+/conf/tpl/*
 .htaccess
 *.swp
 *.bak
@@ -26,25 +27,23 @@
 /data/media_attic/*
 /data/meta/*
 /data/pages/*
+/data/tmp/*
 !/data/pages/wiki/dokuwiki.txt
 !/data/pages/wiki/syntax.txt
 !/data/pages/wiki/welcome.txt
-/data/tmp/*
 /lib/tpl/*
-!/lib/tpl/default
 !/lib/tpl/dokuwiki
 !/lib/tpl/index.php
 /lib/plugins/*
+!/lib/plugins/acl
 !/lib/plugins/authad
 !/lib/plugins/authldap
 !/lib/plugins/authmysql
 !/lib/plugins/authpgsql
 !/lib/plugins/authplain
-!/lib/plugins/acl
 !/lib/plugins/config
 !/lib/plugins/extension
 !/lib/plugins/info
-!/lib/plugins/plugin
 !/lib/plugins/popularity
 !/lib/plugins/revert
 !/lib/plugins/safefnrecode
@@ -52,5 +51,8 @@
 !/lib/plugins/usermanager
 !/lib/plugins/action.php
 !/lib/plugins/admin.php
+!/lib/plugins/auth.php
 !/lib/plugins/index.html
+!/lib/plugins/remote.php
 !/lib/plugins/syntax.php
+lib/images/*/local/*