diff --git a/package.xml b/package.xml
index 6e90c83..426cd75 100644
--- a/package.xml
+++ b/package.xml
@@ -1,68 +1,200 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE package SYSTEM "http://pear.php.net/dtd/package-1.0">
-<package version="1.0" packagerversion="1.9.4">
+<?xml version="1.0" encoding="UTF-8"?> 
+<package 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" packagerversion="1.4.7" version="2.0" 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>lua</name>
+ <channel>pecl.php.net</channel>
  <summary>Embedded lua interpreter</summary>
- <description>&quot;Lua is a powerful, fast, light-weight, embeddable scripting language.&quot; 
- This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.
- </description>
- <maintainers>
-  <maintainer>
-   <user>johannes</user>
-   <name>Johannes Schlüter</name>
-   <email>johannes@php.net</email>
-   <role>lead</role>
-  </maintainer>
-  <maintainer>
-   <user>laruence</user>
-   <name>Xinchen Hui</name>
-   <email>laruence@php.net</email>
-   <role>lead</role>
-  </maintainer>
-  <maintainer>
-   <user>msaraujo</user>
-   <name>Marcelo Araujo</name>
-   <email>msaraujo@php.net</email>
-   <role>developer</role>
-  </maintainer>
-  </maintainers>
- <release>
-  <version>1.1.0</version>
-  <date>2013-10-23</date>
-  <license>PHP</license>
-  <state>beta</state>
-  <notes>- Fixed #65097 (nApplyCount release missing) (emptyhua at gmail dot com)
-- Trigger E_STRICT when pass an array with index &apos;0&apos; to lua instead of ignoring it
-- added support for callable functions and closures as values returned injected into lua engine (harald at octris dot org)
-  </notes>
-  <deps>
-   <dep type="php" rel="ge" version="5.1.0"/>
-  </deps>
-  <filelist>
+ <description>"Lua is a powerful, fast, light-weight, embeddable scripting language." 
+ This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.</description>
+ <lead>
+  <name>Johannes Schlüter</name>
+  <user>johannes</user>
+  <email>johannes@php.net</email>
+  <active>yes</active>
+ </lead>
+ <lead>
+  <name>Xinchen Hui</name>
+  <user>laruence</user>
+  <email>laruence@php.net</email>
+  <active>yes</active>
+ </lead>
+ <developer>
+  <name>Marcelo Araujo</name>
+  <user>msaraujo</user>
+  <email>msaraujo@php.net</email>
+  <active>yes</active>
+ </developer>
+ <date>2013-10-23</date>
+ <time>12:04:27</time>
+ <version>
+  <release>1.1.0</release>
+  <api>1.1.0</api>
+ </version>
+ <stability>
+  <release>beta</release>
+  <api>beta</api>
+ </stability>
+ <license uri="http://www.php.net/license">PHP</license>
+ <notes>
+  - Fixed #65097 (nApplyCount release missing) (emptyhua at gmail dot com)
+  - Trigger E_STRICT when pass an array with index '0' to lua instead of ignoring it
+  - added support for callable functions and closures as values returned injected into lua engine (harald at octris dot org)
+ </notes>
+ <contents> 
+  <dir name="/"> 
+   <file name="config.m4"  role="src" />
+   <file name="php_lua.h"  role="src" />
+   <file name="lua.c"      role="src" />
+   <file name="lua_closure.h" role="src" />
+   <file name="lua_closure.c" role="src" />
+   <file name="config.w32" role="src" />
+   <file name="CREDITS"    role="src" />
+   <file name="EXPERIMENTAL" role="src" />
+   <file name="LICENSE" role="src" />
    <dir name="tests">
-    <file role="test" name="001.phpt"/>
-    <file role="test" name="002.phpt"/>
-    <file role="test" name="003.phpt"/>
-    <file role="test" name="004.phpt"/>
-    <file role="test" name="005.phpt"/>
-    <file role="test" name="006.phpt"/>
-    <file role="test" name="007.phpt"/>
-    <file role="test" name="008.phpt"/>
-    <file role="test" name="009.phpt"/>
-    <file role="test" name="010.phpt"/>
-    <file role="test" name="011.phpt"/>
-    <file role="test" name="012.phpt"/>
-    <file role="test" name="013.phpt"/>
-   </dir> <!-- /tests -->
-   <file role="src" name="config.m4"/>
-   <file role="src" name="config.w32"/>
-   <file role="src" name="CREDITS"/>
-   <file role="src" name="EXPERIMENTAL"/>
-   <file role="src" name="LICENSE"/>
-   <file role="src" name="lua.c"/>
-   <file role="src" name="lua_closure.c"/>
-   <file role="src" name="lua_closure.h"/>
-   <file role="src" name="php_lua.h"/>
-  </filelist>
- </release>
-</package>
+    <file name="001.phpt" role="test" />
+    <file name="002.phpt" role="test" />
+    <file name="003.phpt" role="test" />
+    <file name="004.phpt" role="test" />
+    <file name="005.phpt" role="test" />
+    <file name="006.phpt" role="test" />
+    <file name="007.phpt" role="test" />
+    <file name="008.phpt" role="test" />
+    <file name="009.phpt" role="test" />
+    <file name="010.phpt" role="test" />
+    <file name="011.phpt" role="test" />
+    <file name="012.phpt" role="test" />
+    <file name="013.phpt" role="test" />
+   </dir>
+  </dir> 
+ </contents> 
+ <dependencies> 
+  <required> 
+   <php> 
+    <min>5.1.0</min> 
+   </php> 
+   <pearinstaller> 
+    <min>1.4.0</min> 
+   </pearinstaller> 
+  </required> 
+ </dependencies> 
+ <providesextension>lua</providesextension>
+ <extsrcrelease />
+ <changelog> 
+  <release> 
+   <date>2012-10-23</date> 
+   <version> 
+    <release>1.1.0</release> 
+    <api>1.1.0</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fixed #65097 (nApplyCount release missing) (emptyhua at gmail dot com)
+    - Trigger E_STRICT when pass an array with index '0' to lua instead of ignoring it
+    - added support for callable functions and closures as values returned injected into lua engine (harald at octris dot org)
+   </notes> 
+  </release> 
+
+  <release> 
+   <date>2012-06-24</date> 
+   <version> 
+    <release>1.0.0</release> 
+    <api>1.0.0</api> 
+   </version> 
+   <stability> 
+    <release>stable</release> 
+    <api>stable</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Release stable version
+   </notes> 
+  </release> 
+  <release> 
+   <date>2012-03-19</date> 
+   <version> 
+    <release>0.9.4</release> 
+    <api>0.9.4</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Compatible with lua 5.2
+   </notes> 
+  </release> 
+  <release> 
+   <date>2012-01-12</date> 
+   <version> 
+    <release>0.9.3</release> 
+    <api>0.9.3</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fix build on windows
+    - Fix build when building lua with static
+   </notes> 
+  </release> 
+  <release> 
+   <date>2012-01-06</date> 
+   <version> 
+    <release>0.9.2</release> 
+    <api>0.9.2</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Fixed bug #60641 PECL install lua with lua5.1 packages
+   </notes> 
+  </release> 
+  <release> 
+   <date>2011-11-24</date> 
+   <version> 
+    <release>0.9.1</release> 
+    <api>0.9.1</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Compatible with PHP5.3+
+    - Fix ZTS build
+    - Fix mem leak when get value from lua 
+   </notes> 
+  </release> 
+  <release> 
+   <date>2011-08-03</date> 
+   <version> 
+    <release>0.9.0</release> 
+    <api>0.9.0</api> 
+   </version> 
+   <stability> 
+    <release>beta</release> 
+    <api>beta</api> 
+   </stability> 
+   <license uri="http://www.php.net/license">PHP License</license> 
+   <notes> 
+    - Merge Plua into Lua
+    - Api changes
+    - Add supporting for LUA_TFUNCTION
+   </notes> 
+  </release> 
+ </changelog> 
+</package> 
+<!--
+vim:et:ts=1:sw=1
+--> 
diff --git a/package2.xml b/package2.xml
deleted file mode 100644
index 426cd75..0000000
--- a/package2.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<package 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" packagerversion="1.4.7" version="2.0" 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>lua</name>
- <channel>pecl.php.net</channel>
- <summary>Embedded lua interpreter</summary>
- <description>"Lua is a powerful, fast, light-weight, embeddable scripting language." 
- This extension embeds the lua interpreter and offers an OO-API to lua variables and functions.</description>
- <lead>
-  <name>Johannes Schlüter</name>
-  <user>johannes</user>
-  <email>johannes@php.net</email>
-  <active>yes</active>
- </lead>
- <lead>
-  <name>Xinchen Hui</name>
-  <user>laruence</user>
-  <email>laruence@php.net</email>
-  <active>yes</active>
- </lead>
- <developer>
-  <name>Marcelo Araujo</name>
-  <user>msaraujo</user>
-  <email>msaraujo@php.net</email>
-  <active>yes</active>
- </developer>
- <date>2013-10-23</date>
- <time>12:04:27</time>
- <version>
-  <release>1.1.0</release>
-  <api>1.1.0</api>
- </version>
- <stability>
-  <release>beta</release>
-  <api>beta</api>
- </stability>
- <license uri="http://www.php.net/license">PHP</license>
- <notes>
-  - Fixed #65097 (nApplyCount release missing) (emptyhua at gmail dot com)
-  - Trigger E_STRICT when pass an array with index '0' to lua instead of ignoring it
-  - added support for callable functions and closures as values returned injected into lua engine (harald at octris dot org)
- </notes>
- <contents> 
-  <dir name="/"> 
-   <file name="config.m4"  role="src" />
-   <file name="php_lua.h"  role="src" />
-   <file name="lua.c"      role="src" />
-   <file name="lua_closure.h" role="src" />
-   <file name="lua_closure.c" role="src" />
-   <file name="config.w32" role="src" />
-   <file name="CREDITS"    role="src" />
-   <file name="EXPERIMENTAL" role="src" />
-   <file name="LICENSE" role="src" />
-   <dir name="tests">
-    <file name="001.phpt" role="test" />
-    <file name="002.phpt" role="test" />
-    <file name="003.phpt" role="test" />
-    <file name="004.phpt" role="test" />
-    <file name="005.phpt" role="test" />
-    <file name="006.phpt" role="test" />
-    <file name="007.phpt" role="test" />
-    <file name="008.phpt" role="test" />
-    <file name="009.phpt" role="test" />
-    <file name="010.phpt" role="test" />
-    <file name="011.phpt" role="test" />
-    <file name="012.phpt" role="test" />
-    <file name="013.phpt" role="test" />
-   </dir>
-  </dir> 
- </contents> 
- <dependencies> 
-  <required> 
-   <php> 
-    <min>5.1.0</min> 
-   </php> 
-   <pearinstaller> 
-    <min>1.4.0</min> 
-   </pearinstaller> 
-  </required> 
- </dependencies> 
- <providesextension>lua</providesextension>
- <extsrcrelease />
- <changelog> 
-  <release> 
-   <date>2012-10-23</date> 
-   <version> 
-    <release>1.1.0</release> 
-    <api>1.1.0</api> 
-   </version> 
-   <stability> 
-    <release>beta</release> 
-    <api>beta</api> 
-   </stability> 
-   <license uri="http://www.php.net/license">PHP License</license> 
-   <notes> 
-    - Fixed #65097 (nApplyCount release missing) (emptyhua at gmail dot com)
-    - Trigger E_STRICT when pass an array with index '0' to lua instead of ignoring it
-    - added support for callable functions and closures as values returned injected into lua engine (harald at octris dot org)
-   </notes> 
-  </release> 
-
-  <release> 
-   <date>2012-06-24</date> 
-   <version> 
-    <release>1.0.0</release> 
-    <api>1.0.0</api> 
-   </version> 
-   <stability> 
-    <release>stable</release> 
-    <api>stable</api> 
-   </stability> 
-   <license uri="http://www.php.net/license">PHP License</license> 
-   <notes> 
-    - Release stable version
-   </notes> 
-  </release> 
-  <release> 
-   <date>2012-03-19</date> 
-   <version> 
-    <release>0.9.4</release> 
-    <api>0.9.4</api> 
-   </version> 
-   <stability> 
-    <release>beta</release> 
-    <api>beta</api> 
-   </stability> 
-   <license uri="http://www.php.net/license">PHP License</license> 
-   <notes> 
-    - Compatible with lua 5.2
-   </notes> 
-  </release> 
-  <release> 
-   <date>2012-01-12</date> 
-   <version> 
-    <release>0.9.3</release> 
-    <api>0.9.3</api> 
-   </version> 
-   <stability> 
-    <release>beta</release> 
-    <api>beta</api> 
-   </stability> 
-   <license uri="http://www.php.net/license">PHP License</license> 
-   <notes> 
-    - Fix build on windows
-    - Fix build when building lua with static
-   </notes> 
-  </release> 
-  <release> 
-   <date>2012-01-06</date> 
-   <version> 
-    <release>0.9.2</release> 
-    <api>0.9.2</api> 
-   </version> 
-   <stability> 
-    <release>beta</release> 
-    <api>beta</api> 
-   </stability> 
-   <license uri="http://www.php.net/license">PHP License</license> 
-   <notes> 
-    - Fixed bug #60641 PECL install lua with lua5.1 packages
-   </notes> 
-  </release> 
-  <release> 
-   <date>2011-11-24</date> 
-   <version> 
-    <release>0.9.1</release> 
-    <api>0.9.1</api> 
-   </version> 
-   <stability> 
-    <release>beta</release> 
-    <api>beta</api> 
-   </stability> 
-   <license uri="http://www.php.net/license">PHP License</license> 
-   <notes> 
-    - Compatible with PHP5.3+
-    - Fix ZTS build
-    - Fix mem leak when get value from lua 
-   </notes> 
-  </release> 
-  <release> 
-   <date>2011-08-03</date> 
-   <version> 
-    <release>0.9.0</release> 
-    <api>0.9.0</api> 
-   </version> 
-   <stability> 
-    <release>beta</release> 
-    <api>beta</api> 
-   </stability> 
-   <license uri="http://www.php.net/license">PHP License</license> 
-   <notes> 
-    - Merge Plua into Lua
-    - Api changes
-    - Add supporting for LUA_TFUNCTION
-   </notes> 
-  </release> 
- </changelog> 
-</package> 
-<!--
-vim:et:ts=1:sw=1
--->