diff --git a/.gitignore b/.gitignore
index bd7b686a..1fad6242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,4 +120,6 @@ sess_*
 */logs/*.txt
 d_setting/set.php
 conf.php
+d_setting/conf*.php
 err.txt
+!*/*.orig.php