diff --git a/.gitignore b/.gitignore
index 3895c5b..888ac2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 dist/
 build.properties
+package.xml
diff --git a/build.xml b/build.xml
index bda5641..0654a2b 100644
--- a/build.xml
+++ b/build.xml
@@ -27,6 +27,8 @@
   <property name="sffilepath" value="s/se/semanticscuttle/" />
   <property name="svnpath"    value="https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/" />
 
+  <taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2" />
+
   <target name="zip" depends="check"
    description="Create zip file for release"
    >
@@ -63,59 +65,65 @@
    description="Creates the pear package"
   >
    <!-- fixme: create package.xml with d51pearpkg2 -->
-   <pearpkg2 name="SemanticScuttle" dir=".">
-     <option name="packagefile" value="package.xml" />
-     <option name="channel" value="__uri" />
-     <option name="summary" value="A social bookmarking tool"/>
-     <option name="description" value="A social bookmarking tool experimenting with new features like structured tags or collaborative descriptions of tags."/>
-     <option name="apiversion"       value="${version}" />
-     <option name="apistability"     value="${stability}" />
-     <option name="releaseversion"   value="${version}" />
-     <option name="releasestability" value="${stability}" />
+   <d51pearpkg2 dir="." baseinstalldir="/">
+     <name>SemanticScuttle</name>
+     <summary>A social bookmarking tool</summary>
+     <description>
+       A social bookmarking tool experimenting with new features
+       like structured tags or collaborative descriptions of tags.
+     </description>
+     <channel>__uri</channel>
 
-     <option name="license" value="http://www.gnu.org/licenses/gpl.html" />
+     <lead user="cweiske" name="Christian Weiske" email="cweiske@cweiske.de" />
+     <license>GPL</license>
 
-     <option name="phpdep" value="5.2.0" />
-     <option name="pearinstallerdep" value="1.8.1" />
-     <option name="packagetype" value="php" />
+     <version   release="${version}"   api="${version}" />
+     <stability release="${stability}" api="${stability}" />
 
-     <option name="notes" value="${releasenotes}" />
+     <notes>${releasenotes}</notes>
 
-     <mapping name="maintainers">
-       <element>
-         <element key="handle" value="cweiske" />
-         <element key="name"   value="Christian Weiske" />
-         <element key="email"  value="cweiske@cweiske.de" />
-         <element key="role"   value="lead" />
-         <element key="active" value="no" />
-       </element>
-     </mapping>
+     <dependencies>
+       <php minimum_version="5.2.0" />
+       <pear minimum_version="1.8.1" />
 
-     <mapping name="deps">
-       <element>
-         <element key="channel" value="pear.php.net" />
-         <element key="name"    value="HTML_QuickForm2" />
-         <element key="version" value="0.4.0" />
-       </element>
-     </mapping>
+       <package name="HTML_QuickForm2"
+                channel="pear.php.net"
+                minimum_version="0.4.0"
+                />
 
-     <option name="baseinstalldir" value="/" />
-      <fileset dir=".">
-        <include name="data/**"/>
-        <include name="doc/**"/>
-        <include name="src/**"/>
-        <include name="www/**"/>
-        <exclude name="**/.gitignore/"/>
-        <exclude name="**/.svn/"/>
-        <exclude name="data/config.php"/>
-        <exclude name="data/locales/messages.po"/>
-        <exclude name="data/locales/*/LC_MESSAGES/messages.po"/>
-        <exclude name="doc/developers/"/>
-        <exclude name="src/php-gettext/examples/" />
-        <exclude name="src/php-gettext/bin/"/>
-      </fileset>
+     </dependencies>
+
+     <dirroles key="www">www</dirroles>
+     <dirroles key="data">data</dirroles>
+     <dirroles key="doc">doc</dirroles>
+     <dirroles key="src">php</dirroles>
+     <dirroles key="tests">test</dirroles>
+
+     <ignore>build*</ignore>
+     <ignore>dist</ignore>
+     <ignore>doc/developers</ignore>
+     <ignore>scripts</ignore>
+     <ignore>**/messages.po</ignore>
+
+     <changelog version="0.97" date="2010-06-09" license="GPL">
+- Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now
+- New config option to skip "SET NAMES UTF8" call: $dbneedssetnames
+- Do not highlight admin bookmarks when $enableAdminColors is disabled
+- Add russian translation
+- Make HTML export follow the specifications a bit better
+- Fix bug #2953732: faulty error message for duplicate bookmarks
+- Fix bug #2960663: do not send content-type headers twice for ajax/api scripts
+- Fix bug #2976593: fr_FR locale is vietnamese
+     </changelog>
+
+     <!-- <dirroles key="bin">script</dirroles> -->
+     <!-- <replacement path="bin/doctrine" type="pear-config" from="@php_bin@" to="php_bin" /> -->
+     <!-- <release>
+            <install as="doctrine" name="bin/doctrine" />
+            -->
+   </d51pearpkg2>
+   <!-- <tar destfile="${dist.dir}/DoctrineORM-${version_name}.tgz" basedir="${build.dir}/orm" compression="gzip" />-->
 
-   </pearpkg2>
   </target>