diff --git a/bin/doctrine b/bin/doctrine
index 92f323f8c..c359ca7d8 100644
--- a/bin/doctrine
+++ b/bin/doctrine
@@ -1,4 +1,4 @@
 #!/usr/bin/env php
 <?php
 
-include('doctrine.php');
\ No newline at end of file
+include('doctrine.php');
diff --git a/bin/doctrine-pear.php b/bin/doctrine-pear.php
new file mode 100644
index 000000000..10ce1dd88
--- /dev/null
+++ b/bin/doctrine-pear.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+require_once 'Doctrine/Common/ClassLoader.php';
+
+$classLoader = new \Doctrine\Common\ClassLoader('Doctrine');
+$classLoader->register();
+
+$classLoader = new \Doctrine\Common\ClassLoader('Symfony');
+$classLoader->register();
+
+$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
+
+$helperSet = null;
+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 $helperSetCandidate) {
+        if ($helperSetCandidate instanceof \Symfony\Component\Console\Helper\HelperSet) {
+            $helperSet = $helperSetCandidate;
+            break;
+        }
+    }
+}
+
+$helperSet = ($helperSet) ?: new \Symfony\Component\Console\Helper\HelperSet();
+
+\Doctrine\ORM\Tools\Console\ConsoleRunner::run($helperSet);
diff --git a/bin/doctrine.php b/bin/doctrine.php
index 701038488..3ce1d4f40 100644
--- a/bin/doctrine.php
+++ b/bin/doctrine.php
@@ -17,12 +17,17 @@
  * <http://www.doctrine-project.org>.
  */
 
-require_once 'Doctrine/Common/ClassLoader.php';
+if (!@include __DIR__ . '/../../../autoload.php') {
+   die(<<<'EOT'
+This command can only be run when Doctrine is installed through Composer.
+EOT
+   );
+}
 
 $classLoader = new \Doctrine\Common\ClassLoader('Doctrine');
 $classLoader->register();
 
-$classLoader = new \Doctrine\Common\ClassLoader('Symfony', 'Doctrine');
+$classLoader = new \Doctrine\Common\ClassLoader('Symfony');
 $classLoader->register();
 
 $configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
diff --git a/build.xml b/build.xml
index a2379c654..890ed05bc 100644
--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,7 @@
     -->
     <fileset id="bin-scripts" dir="./bin">
         <include name="doctrine"/>
-        <include name="doctrine.php"/>
+        <include name="doctrine-pear.php"/>
         <include name="doctrine.bat"/>
     </fileset>
 
@@ -104,7 +104,7 @@
            <ignore>Symfony/Component/Console/</ignore>
            <release>
                 <install as="doctrine" name="bin/doctrine" />
-                <install as="doctrine.php" name="bin/doctrine.php" />
+                <install as="doctrine.php" name="bin/doctrine-pear.php" />
                 <install as="doctrine.bat" name="bin/doctrine.bat" />
            </release>
            <replacement path="bin/doctrine" type="pear-config" from="@php_bin@" to="php_bin" />
diff --git a/composer.json b/composer.json
index 0c7652d37..05713321e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,11 +14,16 @@
     "require": {
         "php": ">=5.3.2",
         "ext-pdo": "*",
-        "doctrine/dbal": "2.3.*"
+        "doctrine/dbal": "2.3.*",
+        "symfony/console": "2.*"
+    },
+    "suggest": {
+        "symfony/yaml": "If you want to using YAML Metadata Mapping Driver"
     },
     "autoload": {
         "psr-0": { "Doctrine\\ORM": "lib/" }
     },
+    "bin": ["bin/doctrine", "bin/doctrine.php"],
     "extra": {
         "branch-alias": {
             "dev-master": "2.3.x-dev"