diff --git a/.gitignore b/.gitignore
index d4e9db052c..b91e979679 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,56 +1,35 @@
-syntax: glob
+# Chamilo configuration
 main/inc/conf
-#main/inc/conf/*
-#!main/inc/conf/index.html
-#!main/inc/conf/*.dist.*
 
-#temp directories
+# Temp directories
 archive/*
 !archive/.htaccess
+
+# Courses
+
 courses/*
 !courses/index.html
-main/garbage/*
-!main/garbage/index.html
-!main/garbage/Serializer
-#Home
+
+# Home
 home/*
-#!home/default_platform_document
-#!home/faq.html
-#!home/home_menu.html
-#!home/home_news.html
-#!home/home_notice.html
-#!home/home_top.html
-#!home/index.html
-#!home/large_dokeos_logo.gif
-
-#garbage directory
-
-#Avatar images
+
+# User images
 main/upload/users/*
 !main/upload/users/index.html
 
-#plugins
-#plugin/*
-#!plugin/date
-#!plugin/index.html
-#!plugin/search
-
-#PHP Storm settings directory
-.idea
-.idea/*
-.idea/dictionaries/*
-.idea/cssxfire.xml
+# Logs and databases #
+*.log
 
 # Xapian indexes directory
 searchdb/*
 !searchdb/index.html
 
-*.orig
-main/auth/shibboleth/config.php
-syntax: regexp
-^main/upload/users$
+# IDE settings
 
-syntax: regexp
-^\.settings$
+.idea
+.idea/*
+.idea/dictionaries/*
+.idea/cssxfire.xml
 
+*.orig
 nbproject/*
\ No newline at end of file