diff --git a/.gitignore b/.gitignore
index 8c57c5ce44..0a6dbb3cb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,21 @@
+# Ignore all dotfiles #
+#######################
+.*
+!/.gitignore
+!/.editorconfig
+!/.scrutinizer.yml
+
+
+# Others #
+##########
+*.swp
+Thumbs.db
 config.php
-.index
-junk
-logs
-patches
-rrd
 html/plugins/*
 !html/plugins/Test/
+junk
+logs
 nbproject
-.alerts.lock
-.ircbot.alert
-.metadata_never_index
-*.swp
+patches
+rrd
 
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-.Spotlight-V100
-.Trashes
-Thumbs.db