diff --git a/IDNA/php4.php b/IDNA/php4.php
index 1acbe02..3137bd8 100644
--- a/IDNA/php4.php
+++ b/IDNA/php4.php
@@ -1,5 +1,6 @@
 <?php
 /* ------------------------------------------------------------------------- */
+/* based on:                                                                 */
 /* idna_convert.class.php - Encode / Decode Internationalized Domain Names   */
 /* (c) 2004-2005 phlyLabs, Berlin (http://phlylabs.de)                       */
 /* All rights reserved                                                       */
@@ -53,9 +54,11 @@
  *
  * ACE input and output is always expected to be ASCII.
  *
+ * @author  Markus Nix <mnix@docuverse.de>
  * @author  Matthias Sommerfeld <mso@phlylabs.de>
- * @version 0.4.0
- *
+ * @author  Stefan Neufeind <pear.neufeind@speedpartner.de>
+ * @package Net
+ * @version $Id$
  */
 
 class Net_IDNA_php4
@@ -2959,11 +2962,11 @@ function _show_hex($input, $include_bit = false)
 }
 
 /**
-* Adapter class for aligning the API of idna_convert with that of
+* Adapter class for aligning the API of Net_IDNA_php4 with that of
 * Net_IDNA
 * @author  Matthias Sommerfeld <mso@phlylabs.de>
 */
-class Net_IDNA extends idna_convert
+class Net_IDNA extends Net_IDNA_php4
 {
     /**
     * Constructor
@@ -3001,4 +3004,4 @@ function setParams($option, $param = false)
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/IDNA/php5.php b/IDNA/php5.php
index b92fcac..c2abc1f 100644
--- a/IDNA/php5.php
+++ b/IDNA/php5.php
@@ -50,6 +50,7 @@
  *
  * @author  Markus Nix <mnix@docuverse.de>
  * @author  Matthias Sommerfeld <mso@phlylabs.de>
+ * @author  Stefan Neufeind <pear.neufeind@speedpartner.de>
  * @package Net
  * @version $Id$
  */
@@ -3223,4 +3224,4 @@ private static function _showBitmask($octet)
     // }}}}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/package.xml b/package.xml
new file mode 100644
index 0000000..faa7b62
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE package SYSTEM "http://pear.php.net/dtd/package-1.0">
+<package version="1.0">
+  <name>Net_IDNA</name>
+  <summary>Punycode encoding and decoding.</summary>
+  <description>This package helps you to encode and decode punycode strings easily.</description>
+  <maintainers>
+    <maintainer>
+      <user>mnx</user>
+      <name>Markus Nix</name>
+      <email>mnix@docuverse.de</email>
+      <role>lead</role>
+    </maintainer>
+    <maintainer>
+      <user>mso</user>
+      <name>Matthias Sommerfeld</name>
+      <email>mso@phlylabs.de</email>
+      <role>lead</role>
+    </maintainer>
+  </maintainers>
+  <release>
+    <version>0.7.1</version>
+    <date>2005-08-13</date>
+    <license>LGPL</license>
+    <state>beta</state>
+    <notes>Fixed error handling (&quot;Beloved Benjamin Muskalla version&quot;)</notes>
+    <deps>
+      <dep type="php" rel="ge" version="4.3.0" optional="no"/>
+      <dep type="php" rel="ge" version="5.0.0RC1" optional="yes"/>
+    </deps>
+    <filelist>
+      <file role="php" baseinstalldir="Net" md5sum="67129143b00f615b90efd8266f48ae1a" name="IDNA.php"/>
+      <file role="php" baseinstalldir="Net" md5sum="fbec9a4461dfd76c10b4e5dc2be27961" name="IDNA/php4.php"/>
+      <file role="php" baseinstalldir="Net" md5sum="f4d03aac2e55c7ba6b625ad728505934" name="IDNA/php5.php"/>
+      <file role="test" baseinstalldir="Net" md5sum="4531a384843d33902921cbb4a2a6df45" name="test/test_php4.php"/>
+      <file role="test" baseinstalldir="Net" md5sum="9ccee505f9ac173b5a31a1cfb5ef2a35" name="test/test_php5.php"/>
+    </filelist>
+  </release>
+  <changelog>
+    <release>
+      <version>0.6.0</version>
+      <date>2005-08-03</date>
+      <state>beta</state>
+      <notes>Several fixes, fixed problems with unicode codepoints.
+</notes>
+    </release>
+    <release>
+      <version>0.5.0</version>
+      <date>2005-02-01</date>
+      <state>beta</state>
+      <notes>Fixed bug #2801: Changed dependency settings (Package now works fine with PHP4 and 5).
+</notes>
+    </release>
+    <release>
+      <version>0.4.0</version>
+      <date>2004-11-14</date>
+      <state>beta</state>
+      <notes>Fixed bug #2717: The German sharp S (ß) is converted incorrect. It isn't treated as a special character but simply replaced by &quot;ss&quot;.
+</notes>
+    </release>
+    <release>
+      <version>0.3.0</version>
+      <date>2004-08-16</date>
+      <state>beta</state>
+      <notes>Initial release.
+</notes>
+    </release>
+  </changelog>
+</package>