diff --git a/.gitignore b/.gitignore
index 2ab8b0a6666..1cfbf977129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,9 @@
 /.patches/
 /.idea/
 .phpstorm.*
-!.phpstorm.meta.php
+!/.phpstorm.meta.php/
+/.phpstorm.meta.php/*
+!/.phpstorm.meta.php/di.php
 /nbproject/
 CVS
 .DS_Store
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php/di.php
similarity index 100%
rename from .phpstorm.meta.php
rename to .phpstorm.meta.php/di.php