diff --git a/src/Finder.php b/src/Finder.php
index 68a6a3216a4..e417b4a7369 100644
--- a/src/Finder.php
+++ b/src/Finder.php
@@ -13,6 +13,7 @@
 namespace PhpCsFixer;
 
 use Symfony\Component\Finder\Finder as BaseFinder;
+use Symfony\Component\Finder\Iterator\LazyIterator;
 
 /**
  * @author Fabien Potencier <fabien@symfony.com>
@@ -27,11 +28,17 @@ public function __construct()
         $this
             ->files()
             ->name('*.php')
-            ->ignoreDotFiles(false)
-            ->notPath('~(^|/)\.(?!php_cs(\.dist)?(/|$)).+(/|$)~')
-            ->name('.php_cs')
-            ->name('.php_cs.dist')
             ->exclude('vendor')
         ;
+
+        // add config files even if dot files are ignored
+        $mainIterator = $this;
+        $this->append(new \IteratorIterator(new LazyIterator(function () use ($mainIterator) {
+            $iterator = clone $mainIterator;
+            $iterator->ignoreDotFiles(false);
+            $iterator->name('~^\.(php_cs(\..+)?$~is');
+
+            return $iterator;
+        })));
     }
 }