diff --git a/bin/doctrine.php b/bin/doctrine.php
index 0de3b44c7..0c46cac26 100644
--- a/bin/doctrine.php
+++ b/bin/doctrine.php
@@ -5,7 +5,25 @@ require_once 'Doctrine/Common/ClassLoader.php';
 $classLoader = new \Doctrine\Common\ClassLoader('Doctrine');
 $classLoader->register();
 
+$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
 $configuration = new \Doctrine\Common\Cli\Configuration();
 
+if (file_exists($configFile)) {
+    if ( ! is_readable($configFile)) {
+        trigger_error(
+            'Configuration file [' . $configFile . '] does not have read permission.', E_ERROR
+        );
+    }
+
+    require $configFile;
+    
+    foreach ($GLOBALS as $configCandidate) {
+        if ($configCandidate instanceof \Doctrine\Common\Cli\Configuration) {
+            $configuration = $configCandidate;
+            break;
+        }
+    }
+}
+
 $cli = new \Doctrine\Common\Cli\CliController($configuration);
 $cli->run($_SERVER['argv']);
\ No newline at end of file