diff --git a/build.properties.dev b/build.properties.dev
index 5f9991d92..46e6373ad 100644
--- a/build.properties.dev
+++ b/build.properties.dev
@@ -1,4 +1,14 @@
-version=2.0-alpha1
+name=Doctrine
+summary=PHP5 Database ORM
+description=Doctrine is an ORM (object relational mapper) for PHP 5.2.x+ that sits on top of
+a powerful DBAL (database abstraction layer). One of its key features is the
+ability to optionally write database queries in an OO (object oriented)
+SQL-dialect called DQL inspired by Hibernates HQL. This provides developers with
+a powerful alternative to SQL that maintains a maximum of flexibility without
+requiring needless code duplication.
+version_name=2.0.0-ALPHA1
+version=2.0.0
+stability=alpha
 build.dir=build
 dist.dir=dist
 report.dir=reports
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 6ce182a78..6a48d29d9 100644
--- a/build.xml
+++ b/build.xml
@@ -4,8 +4,9 @@
     Doctrine 2 build file.
 -->
 
-<project name="Doctrine2" default="dist-orm" basedir=".">
-    
+<project name="Doctrine2" default="build" basedir=".">
+    <taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2" />
+
     <property file="build.properties" />
     
     <!-- 
@@ -48,6 +49,7 @@
         <include name="tools/sandbox/cli-config.php"/>
         <include name="tools/sandbox/config.php"/>
         <include name="tools/sandbox/doctrine"/>
+        <include name="tools/sandbox/doctrine.php"/>
         <include name="tools/sandbox/index.php"/>
     </fileset>
 
@@ -94,6 +96,8 @@
         </copy>
     </target>
     
+    <target name="build" depends="test, build-orm"/>
+
     <target name="prepare-test">
         <mkdir dir="${build.dir}/logs"/>
         <mkdir dir="${report.dir}/tests"/>
@@ -113,39 +117,48 @@
         </phpunit>
         <phpunitreport infile="build/logs/testsuites.xml" format="frames" todir="reports/tests" />
     </target>
-    
-    <!-- 
-        Distributes the Doctrine Common package.
-    -->
-    <target name="dist-common">
-        <tar destfile="${dist.dir}/Doctrine-${version}-common.tar.gz" compression="gzip">
-            <fileset dir="${build.dir}/common">
-                <include name="**" />
-            </fileset>
-        </tar>
-    </target>
-    
-    <!-- 
-        Distributes the Doctrine DBAL package.
-    -->
-    <target name="dist-dbal">
-        <tar destfile="${dist.dir}/Doctrine-${version}-dbal.tar.gz" compression="gzip">
-            <fileset dir="${build.dir}/dbal">
-                <include name="**" />
-            </fileset>
-        </tar>
+
+    <target name="build-tar-packages" depends="test, build-orm">
+      <tar destfile="${dist.dir}/DoctrineCommon-${version_name}.tar.gz" compression="gzip">
+          <fileset dir="${build.dir}/common">
+              <include name="**" />
+          </fileset>
+      </tar>
+      <tar destfile="${dist.dir}/DoctrineDBAL-${version_name}.tar.gz" compression="gzip">
+          <fileset dir="${build.dir}/dbal">
+              <include name="**" />
+          </fileset>
+      </tar>
+      <tar destfile="${dist.dir}/DoctrineORM-${version_name}.tar.gz" compression="gzip">
+          <fileset dir="${build.dir}/orm">
+              <include name="**" />
+          </fileset>
+      </tar>
     </target>
 
-    <!--
-        DEFAULT TARGET
-        Tests, builds and distributes the full Doctrine package (Common+DBAL+ORM).
-    -->
-    <target name="dist-orm" depends="test, build-orm, dist-common, dist-dbal">
-        <tar destfile="${dist.dir}/Doctrine-${version}-orm.tar.gz" compression="gzip">
-            <fileset dir="${build.dir}/orm">
-                <include name="**" />
-            </fileset>
-        </tar>
+    <target name="build-pear-packages" depends="test, build-orm">
+        <d51pearpkg2 baseinstalldir="Doctrine" dir="${build.dir}/orm">
+           <name>${name}</name>
+           <summary>${summary}</summary>
+           <channel>pear.phpdoctrine.org</channel>
+           <description>${description}</description>
+           <lead user="jwage" name="Jonathan H. Wage" email="jonwage@gmail.com" />
+           <lead user="guilhermeblanco" name="Guilherme Blanco" email="guilhermeblanco@gmail.com" />
+           <lead user="romanb" name="Roman Borschel" email="roman@code-factory.org" />
+           <license>LGPL</license>
+           <version release="${version}" api="${version}" />
+           <stability release="${stability}" api="${stability}" />
+           <notes>-</notes>
+           <dependencies>
+               <php minimum_version="5.3.0" />
+               <pear minimum_version="1.6.0" recommended_version="1.6.1" />
+           </dependencies>
+        </d51pearpkg2>
+
+        <tar destfile="${dist.dir}/DoctrineCommon-${version_name}.tgz" basedir="${build.dir}/common" compression="gzip" />
+        <tar destfile="${dist.dir}/DoctrineDBAL-${version_name}.tgz" basedir="${build.dir}/dbal" compression="gzip" />
+        <tar destfile="${dist.dir}/DoctrineORM-${version_name}.tgz" basedir="${build.dir}/orm" compression="gzip" />
     </target>
-    
-</project>
+
+    <target name="build-packages" depends="test, build-pear-packages, build-tar-packages"/>
+</project>
\ No newline at end of file
diff --git a/doctrine b/doctrine
deleted file mode 100755
index ccf9d6712..000000000
--- a/doctrine
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-require __DIR__ . '/lib/Doctrine/Common/ClassLoader.php';
-
-$classLoader = new \Doctrine\Common\ClassLoader();
-$classLoader->setBasePath('Doctrine', __DIR__ . '/lib');
-
-$cli = new \Doctrine\ORM\Tools\Cli();
-$cli->run($_SERVER['argv']);
diff --git a/tools/sandbox/doctrine b/tools/sandbox/doctrine
index 87f76e486..92f323f8c 100755
--- a/tools/sandbox/doctrine
+++ b/tools/sandbox/doctrine
@@ -1,10 +1,4 @@
 #!/usr/bin/env php
 <?php
 
-require __DIR__ . '/../../lib/Doctrine/Common/ClassLoader.php';
-
-$classLoader = new \Doctrine\Common\ClassLoader();
-$classLoader->setBasePath('Doctrine', __DIR__ . '/../../lib');
-
-$cli = new \Doctrine\ORM\Tools\Cli();
-$cli->run($_SERVER['argv']);
+include('doctrine.php');
\ No newline at end of file
diff --git a/tools/sandbox/doctrine.php b/tools/sandbox/doctrine.php
new file mode 100644
index 000000000..d868ced52
--- /dev/null
+++ b/tools/sandbox/doctrine.php
@@ -0,0 +1,9 @@
+<?php
+
+require __DIR__ . '/../../lib/Doctrine/Common/ClassLoader.php';
+
+$classLoader = new \Doctrine\Common\ClassLoader();
+$classLoader->setBasePath('Doctrine', __DIR__ . '/../../lib');
+
+$cli = new \Doctrine\ORM\Tools\Cli();
+$cli->run($_SERVER['argv']);
\ No newline at end of file