diff --git a/package.xml b/package.xml
index 9865537..79616af 100644
--- a/package.xml
+++ b/package.xml
@@ -1,157 +1,287 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE package SYSTEM "http://pear.php.net/dtd/package-1.0">
-<package version="1.0" packagerversion="1.4.1">
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.11" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
  <name>gnupg</name>
+ <channel>pecl.php.net</channel>
  <summary>wrapper around the gpgme library</summary>
  <description>This extension provides methods to interact with gnupg.
+ 
  </description>
- <maintainers>
-  <maintainer>
-   <user>traufeisen</user>
-   <name>Thilo Raufeisen</name>
-   <email>traufeisen@php.net</email>
-   <role>lead</role>
-  </maintainer>
-  </maintainers>
- <release>
-  <version>1.3.1</version>
-  <date>2007-05-04</date>
-  <license>BSD, revised</license>
-  <state>stable</state>
-  <notes>fixed double-free with recent gpgme-lib</notes>
-  <deps>
-   <dep type="php" rel="ge" version="4.4"/>
-  </deps>
-  <filelist>
-   <file role="doc" name="LICENSE"/>
-   <file role="doc" name="EXPERIMENTAL"/>
-   <file role="doc" name="README"/>
-   <file role="src" name="config.m4"/>
-   <file role="src" name="php_gnupg.h"/>
-   <file role="src" name="php_gnupg_keylistiterator.h" />
-   <file role="src" name="gnupg.c"/>
-   <file role="src" name="gnupg_keylistiterator.c" />
+ <lead>
+  <name>Thilo Raufeisen</name>
+  <user>traufeisen</user>
+  <email>traufeisen@php.net</email>
+  <active>yes</active>
+ </lead>
+ <date>2007-05-04</date>
+ <time>14:31:41</time>
+ <version>
+  <release>1.3.1</release>
+  <api>1.3.1</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license>BSD, revised</license>
+ <notes>fixed double-free with recent gpgme-lib
+ </notes>
+ <contents>
+  <dir name="/">
    <dir name="tests">
-	<file role="test" name="gnupg_oo_0001_import.phpt" />
-	<file role="test" name="gnupg_oo_encrypt.phpt" />
-	<file role="test" name="gnupg_oo_encryptsign.phpt" />
-	<file role="test" name="gnupg_oo_export.phpt" />
-	<file role="test" name="gnupg_oo_keyinfo.phpt" />
-	<file role="test" name="gnupg_oo_listsignatures.phpt" />
-	<file role="test" name="gnupg_oo_sign_clear.phpt" />
-	<file role="test" name="gnupg_oo_sign_detach_nonarmor.phpt" />
-	<file role="test" name="gnupg_oo_sign_detach.phpt" />
-	<file role="test" name="gnupg_oo_sign_normal_noarmor.phpt" />
-	<file role="test" name="gnupg_oo_sign_normal.phpt" />
-	<file role="test" name="gnupg_oo_zzz_deletekey.phpt" />
-	<file role="test" name="gnupg_res_0001_import.phpt" />
-	<file role="test" name="gnupg_res_encrypt.phpt" />
-	<file role="test" name="gnupg_res_encryptsign.phpt" />
-	<file role="test" name="gnupg_res_export.phpt" />
-	<file role="test" name="gnupg_res_keyinfo.phpt" />
-	<file role="test" name="gnupg_res_listsignatures.phpt" />
-	<file role="test" name="gnupg_res_sign_clear.phpt" />
-	<file role="test" name="gnupg_res_sign_detach_nonarmor.phpt" />
-	<file role="test" name="gnupg_res_sign_detach.phpt" />
-	<file role="test" name="gnupg_res_sign_normal_noarmor.phpt" />
-	<file role="test" name="gnupg_res_sign_normal.phpt" />
-	<file role="test" name="gnupg_res_zzz_deletekey.phpt" />
-   </dir>
-  </filelist>
- </release>
+    <file name="gnupg_oo_0001_import.phpt" role="test" />
+    <file name="gnupg_oo_encrypt.phpt" role="test" />
+    <file name="gnupg_oo_encryptsign.phpt" role="test" />
+    <file name="gnupg_oo_export.phpt" role="test" />
+    <file name="gnupg_oo_keyinfo.phpt" role="test" />
+    <file name="gnupg_oo_listsignatures.phpt" role="test" />
+    <file name="gnupg_oo_sign_clear.phpt" role="test" />
+    <file name="gnupg_oo_sign_detach.phpt" role="test" />
+    <file name="gnupg_oo_sign_detach_nonarmor.phpt" role="test" />
+    <file name="gnupg_oo_sign_normal.phpt" role="test" />
+    <file name="gnupg_oo_sign_normal_noarmor.phpt" role="test" />
+    <file name="gnupg_oo_zzz_deletekey.phpt" role="test" />
+    <file name="gnupg_res_0001_import.phpt" role="test" />
+    <file name="gnupg_res_encrypt.phpt" role="test" />
+    <file name="gnupg_res_encryptsign.phpt" role="test" />
+    <file name="gnupg_res_export.phpt" role="test" />
+    <file name="gnupg_res_keyinfo.phpt" role="test" />
+    <file name="gnupg_res_listsignatures.phpt" role="test" />
+    <file name="gnupg_res_sign_clear.phpt" role="test" />
+    <file name="gnupg_res_sign_detach.phpt" role="test" />
+    <file name="gnupg_res_sign_detach_nonarmor.phpt" role="test" />
+    <file name="gnupg_res_sign_normal.phpt" role="test" />
+    <file name="gnupg_res_sign_normal_noarmor.phpt" role="test" />
+    <file name="gnupg_res_zzz_deletekey.phpt" role="test" />
+   </dir> <!-- //tests -->
+   <file name="config.m4" role="src" />
+   <file name="EXPERIMENTAL" role="doc" />
+   <file name="gnupg.c" role="src" />
+   <file name="gnupg_keylistiterator.c" role="src" />
+   <file name="LICENSE" role="doc" />
+   <file name="php_gnupg.h" role="src" />
+   <file name="php_gnupg_keylistiterator.h" role="src" />
+   <file name="README" role="doc" />
+  </dir> <!-- / -->
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>4.4</min>
+   </php>
+   <pearinstaller>
+    <min>1.4.0b1</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <providesextension>gnupg</providesextension>
+ <extsrcrelease />
  <changelog>
-	<release>
-		<version>1.3.1</version>
-  <date>2007-05-04</date>
-  <license>BSD, revised</license>
-  <state>stable</state>
-  <notes>fixed double-free with recent gpgme-lib</notes>
-    </release>
-	<release>
-		<version>1.3</version>
-		<date>2006-11-06</date>
-		<state>stable</state>
-		<notes>PHP 5.2 compatibility
+  <release>
+   <version>
+    <release>1.3.1</release>
+    <api>1.3.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2007-05-04</date>
+   <license>BSD, revised</license>
+   <notes>fixed double-free with recent gpgme-lib
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3</release>
+    <api>1.3</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2006-11-06</date>
+   <license>BSD, revised</license>
+   <notes>PHP 5.2 compatibility
 gnupg_deletekey now allows deleting a secret key in procedural usage
-bumped min version to 4.4</notes>
-	</release>
-	<release>
-		<version>1.2</version>
-		<date>2006-05-23</date>
-		<state>stable</state>
-		<notes>fixed bug #7587 (gnupg_verify fails with detached signature)
-added "summary" into signature-array</notes>
-	</release>
-	<release>
-		<version>1.1</version>
-		<date>2006-03-16</date>
-		<state>stable</state>
-		<notes>improved PHP4 compatibility
-passphrase-errors now takes care of the errormode</notes>
-	</release>
-	<release>
-		<version>1.0</version>
-		<date>2005-12-29</date>
-		<state>stable</state>
-		<notes>bump to stable</notes>
-	</release>
-    <release>
-        <version>0.7.1</version>
-        <date>2005-12-01</date>
-        <state>beta</state>
-        <notes>fixed PHP 5.1 build</notes>
-    </release>
-	<release>
-		<version>0.7</version>
-		<date>2005-11-29</date>
-		<state>beta</state>
-		<notes>changed licence to BSD, revised
+bumped min version to 4.4
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.2</release>
+    <api>1.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2006-05-23</date>
+   <license>BSD, revised</license>
+   <notes>fixed bug #7587 (gnupg_verify fails with detached signature)
+added &quot;summary&quot; into signature-array
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1</release>
+    <api>1.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2006-03-16</date>
+   <license>BSD, revised</license>
+   <notes>improved PHP4 compatibility
+passphrase-errors now takes care of the errormode
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0</release>
+    <api>1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2005-12-29</date>
+   <license>BSD, revised</license>
+   <notes>bump to stable
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.7.1</release>
+    <api>0.7.1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-12-01</date>
+   <license>BSD, revised</license>
+   <notes>fixed PHP 5.1 build
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.7</release>
+    <api>0.7</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-11-29</date>
+   <license>BSD, revised</license>
+   <notes>changed licence to BSD, revised
 fixed error during keyimport when the keyring is not writeable
-fixed error when an invalid errormode is passed to seterrormode</notes>
-	</release>
-	<release>
-        <version>0.6.1</version>
-        <date>2005-11-12</date>
-        <state>beta</state>
-        <notes>fixed zts build</notes>
-    </release>
-	<release>
-		<version>0.6</version>
-		<date>2005-11-12</date>
-		<state>beta</state>
-		<notes>+ added seterrormode
-- various memory optimizations</notes>
-	</release>
-	<release>
-		<version>0.5</version>
-		<date>2005-10-25</date>
-		<state>beta</state>
-		<notes>now supports multiple keys. added getsignatures. verify can now handle all signature types. therefore the API has changed.</notes>
-	</release>
-	<release>
-		<version>0.4</version>
-		<date>2005-10-17</date>
-		<state>beta</state>
-		<notes>added procedual usage and lowered min PHP Version to 4.3</notes>
-	</release>
-	<release>
-		<version>0.3</version>
-		<date>2005-10-15</date>
-		<state>beta</state>
-		<notes>added import/export methods and better errormessages</notes>
-	</release>
- 	<release>
-		<version>0.2</version>
-		<date>2005-10-10</date>
-		<state>beta</state>
-		<notes>added keylistiterator, encryptsign and decryptverify</notes>
-	</release>
-   <release>
-    <version>0.1</version>
-    <date>2005-10-07</date>
-    <state>beta</state>
-    <notes>initial release
-    </notes>
-   </release>
+fixed error when an invalid errormode is passed to seterrormode
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.6.1</release>
+    <api>0.6.1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-11-12</date>
+   <license>BSD, revised</license>
+   <notes>fixed zts build
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.6</release>
+    <api>0.6</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-11-12</date>
+   <license>BSD, revised</license>
+   <notes>+ added seterrormode
+- various memory optimizations
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.5</release>
+    <api>0.5</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-10-25</date>
+   <license>BSD, revised</license>
+   <notes>now supports multiple keys. added getsignatures. verify can now handle all signature types. therefore the API has changed.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.4</release>
+    <api>0.4</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-10-17</date>
+   <license>BSD, revised</license>
+   <notes>added procedual usage and lowered min PHP Version to 4.3
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.3</release>
+    <api>0.3</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-10-15</date>
+   <license>BSD, revised</license>
+   <notes>added import/export methods and better errormessages
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.2</release>
+    <api>0.2</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-10-10</date>
+   <license>BSD, revised</license>
+   <notes>added keylistiterator, encryptsign and decryptverify
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.1</release>
+    <api>0.1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2005-10-07</date>
+   <license>BSD, revised</license>
+   <notes>initial release
+    
+   </notes>
+  </release>
  </changelog>
 </package>