diff --git a/.gitignore b/.gitignore
index f5d856baf..85a9ffbca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,19 @@
-/plugins/*
\ No newline at end of file
+# Piwigo specific directories
+/_data
+/plugins/*
+!/plugins/index.php
+/upload
+/galleries/*
+!/galleries/index.php
+/local/*
+!/local/**/index.php
+
+# IntelliJ
+.idea
+*.iml
+*.ipr
+*.iws
+
+# Eclipse
+.settings
+.project
\ No newline at end of file