diff --git a/build/pad/Dolibarr developpers.cml b/build/pad/Dolibarr developpers.cml
index 4f7071fc9bb..0e1e3bcdc32 100644
--- a/build/pad/Dolibarr developpers.cml	
+++ b/build/pad/Dolibarr developpers.cml	
@@ -1,27 +1,31 @@
-<Company_Info>
-        <Company_Name>Dolibarr Developpers</Company_Name>
-        <Address_1 />
-        <Address_2 />
-        <City_Town />
-        <State_Province />
-        <Zip_Postal_Code />
-        <Country>FRANCE</Country>
-        <Company_WebSite_URL>http://dolibarr.com</Company_WebSite_URL>
-<Contact_Info>
-        <Author_First_Name />
-        <Author_Last_Name />
-        <Author_Email>eldy@users.sourceforge.net</Author_Email>
-        <Contact_First_Name />
-        <Contact_Last_Name />
-        <Contact_Email />
-    </Contact_Info>
-<Support_Info>
-        <Sales_Email />
-        <Support_Email />
-        <General_Email />
-        <Sales_Phone />
-        <Support_Phone />
-        <General_Phone />
-        <Fax_Phone />
-    </Support_Info>
-</Company_Info>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_CML>
+	<AppVerInfo>PADGen 2.0.1.22</AppVerInfo>
+	<Company_Info>
+		<Company_Name>Dolibarr Developpers</Company_Name>
+		<Address_1 />
+		<Address_2 />
+		<City_Town />
+		<State_Province />
+		<Zip_Postal_Code />
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.dolibarr.com</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name />
+			<Author_Last_Name />
+			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
+			<Contact_First_Name />
+			<Contact_Last_Name />
+			<Contact_Email />
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email />
+			<Support_Email />
+			<General_Email />
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+</PADGEN_CML>
diff --git a/build/pad/Dolibarr v2.0.pml b/build/pad/Dolibarr v2.0.pml
index 02294cc0365..1ff58135b46 100644
--- a/build/pad/Dolibarr v2.0.pml	
+++ b/build/pad/Dolibarr v2.0.pml	
@@ -1,83 +1,88 @@
-<CompanyName>
-Laurent Destailleur
-</CompanyName>
-<Program_Info>
-        <Program_Name>AWStats</Program_Name>
-        <Program_Version>6.2</Program_Version>
-        <Program_Release_Month>11</Program_Release_Month>
-        <Program_Release_Day>06</Program_Release_Day>
-        <Program_Release_Year>2004</Program_Release_Year>
-        <Program_Cost_Dollars>0</Program_Cost_Dollars>
-        <Program_Cost_Other_Code />
-        <Program_Cost_Other>0</Program_Cost_Other>
-        <Program_Type>Freeware</Program_Type>
-        <Program_Release_Status>Minor Update</Program_Release_Status>
-        <Program_Install_Support>No Install Support</Program_Install_Support>
-        <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,WinXP,Windows2000,Unix,Linux,OS/2,OS/2 Warp,OS/2 Warp 4,MAC 68k,Mac PPC</Program_OS_Support>
-        <Program_Language>English,Spanish,French,German,Italian,Japanese,ChineseSimplified,ChineseTraditional,Russian</Program_Language>
-<File_Info>
-        <Filename_Versioned>awstats-62.zip</Filename_Versioned>
-        <Filename_Previous>awstats-61.zip</Filename_Previous>
-        <Filename_Generic>awstats-.zip</Filename_Generic>
-        <Filename_Long>awstats.zip</Filename_Long>
-        <File_Size_Bytes>1016660</File_Size_Bytes>
-        <File_Size_K>993</File_Size_K>
-        <File_Size_MB>0.99</File_Size_MB>
-    </File_Info>
-<Expire_Info>
-        <Has_Expire_Info>N</Has_Expire_Info>
-        <Expire_Count />
-        <Expire_Based_On>Days</Expire_Based_On>
-        <Expire_Other_Info />
-        <Expire_Month />
-        <Expire_Day />
-        <Expire_Year />
-    </Expire_Info>
-        <Program_Change_Info>http://awstats.sourceforge.net/docs/awstats_changelog.txt</Program_Change_Info>
-        <Program_Specific_Category>Internet</Program_Specific_Category>
-        <Program_Categories>Log analyzer</Program_Categories>
-        <Program_System_Requirements>None</Program_System_Requirements>
-        <Includes_JAVA_VM>N</Includes_JAVA_VM>
-        <Includes_VB_Runtime>N</Includes_VB_Runtime>
-        <Includes_DirectX>N</Includes_DirectX>
-</Program_Info>
-<Program_Descriptions>
-<English>
-        <Keywords>awstats, awstat, log, file, analyzer, analysis, web, mail, logfile, free, advanced, real-time, tool, perl, cgi, software, statistics, stats, analyze, apache, IIS, reports, counter, graphical, analyse, statistiques, freeware, gnu, gpl, project, linux</Keywords>
-        <Char_Desc_45>AWStats - Free log file analyzer (GNU GPL)</Char_Desc_45>
-        <Char_Desc_80>AWStats - Free web server log file analyzer for advanced web statistics (GPL)</Char_Desc_80>
-        <Char_Desc_250>Advanced Web Statistics (AWStats) is a free powerful web server logfile analyzer that shows you all your Web statistics including visits, unique visitors, pages, hits, rush hours, os, browsers, search engines, keywords, robots, errors, and more...</Char_Desc_250>
-        <Char_Desc_450>Advanced Web Statistics (AWStats) is a free powerful and featureful web server logfile analyzer that shows you all your Web statistics including visits, unique visitors, pages, hits, rush hours, os, browser's versions, search engines, keywords, robots visits, broken links, HTTP errors and more...
-Works with all major web (but also mail and FTP) log servers as a CGI and/or from command line.
-Distributed under GNU General Public License.</Char_Desc_450>
-        <Char_Desc_2000>Advanced Web Statistics (AWStats) is a free powerful and featureful server logfile analyzer that shows you all your Web statistics including visits, unique visitors, pages, hits, rush hours, os, browsers and versions, search engines, keywords, robots visits, broken links, HTTP errors, mod_gzip or mod_deflate compression ratios, number of times your site is &quot;added to favourites&quot;, report browser support for PDF, Flash, Java, screen size, other personalized reports, and more...
-Many plugins, dynamic filters, and a very high level of parameters.
-Reports can be in serveral languages.
-Works with all major web (but also mail and FTP) log servers as a CGI and/or from command line.
-Distributed under GNU General Public License.</Char_Desc_2000>
-</English>
-</Program_Descriptions>
-<Web_Info>
-<Application_URLs>
-        <Application_Info_URL>http://awstats.sourceforge.net</Application_Info_URL>
-        <Application_Order_URL>http://awstats.sourceforge.net</Application_Order_URL>
-        <Application_Screenshot_URL>http://awstats.sourceforge.net/docs/images/screen_shot_1.jpg</Application_Screenshot_URL>
-        <Application_Icon_URL>http://awstats.sourceforge.net/docs/images/awstats_logo1.gif</Application_Icon_URL>
-        <Application_XML_File_URL>http://awstats.sourceforge.net/docs/pad_awstats.xml</Application_XML_File_URL>
-    </Application_URLs>
-<Download_URLs>
-        <Primary_Download_URL>http://awstats.sourceforge.net/files/awstats.zip</Primary_Download_URL>
-        <Secondary_Download_URL>http://prdownloads.sourceforge.net/awstats/awstats-62.zip</Secondary_Download_URL>
-        <Additional_Download_URL_1 />
-        <Additional_Download_URL_2 />
-    </Download_URLs>
-</Web_Info>
-<Permissions>
-        <Distribution_Permissions>GNU GPL</Distribution_Permissions>
-        <EULA>GNU GPL</EULA>
-</Permissions>
-<ASP>
-    <ASP_FORM>Y</ASP_FORM>
-    <ASP_Member>N</ASP_Member>
-    <ASP_Member_Number />
-</ASP>
+<?xml version="1.0" encoding="UTF-8" ?>
+<PADGEN_PML>
+	<AppVerInfo>PADGen 2.0.1.22</AppVerInfo>
+	<CompanyName />
+	<Program_Info>
+		<Program_Name>Dolibarr</Program_Name>
+		<Program_Version>2.0</Program_Version>
+		<Program_Release_Month>10</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2005</Program_Release_Year>
+		<Program_Cost_Dollars>0</Program_Cost_Dollars>
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other>0</Program_Cost_Other>
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Minor Update</Program_Release_Status>
+		<Program_Install_Support>No Install Support</Program_Install_Support>
+		<Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP,Windows2003,Unix,Linux,OS/2,OS/2 Warp,OS/2 Warp 4,MAC 68k,Mac PPC,Mac OS X,Mac Other,BEOS</Program_OS_Support>
+		<Program_Language>English,French</Program_Language>
+		<Program_Change_Info>http://dolibarr.com</Program_Change_Info>
+		<Program_Specific_Category>Internet</Program_Specific_Category>
+		<Program_Category_Class />
+		<Program_Categories>Log analyzer</Program_Categories>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<Includes_JAVA_VM>N</Includes_JAVA_VM>
+		<Includes_VB_Runtime>N</Includes_VB_Runtime>
+		<Includes_DirectX>N</Includes_DirectX>
+		<File_Info>
+			<Filename_Versioned>awstats-62.zip</Filename_Versioned>
+			<Filename_Previous>awstats-61.zip</Filename_Previous>
+			<Filename_Generic>awstats-.zip</Filename_Generic>
+			<Filename_Long>awstats.zip</Filename_Long>
+			<File_Size_Bytes>1016660</File_Size_Bytes>
+			<File_Size_K>992</File_Size_K>
+			<File_Size_MB>0.97</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>dolibarr</Keywords>
+			<Char_Desc_45>Dolibarr ERP/CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP/CRM</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP/CRM is an open source tool to manage invoices, customers, suppliers, contracts and any other things a small or meidum company need.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP/CRM is an open source tool to manage invoices, customers, suppliers, contracts and any other things a small or meidum company need.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP/CRM is an open source tool to manage invoices, customers, suppliers, contracts and any other things a small or meidum company need.</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords />
+			<Char_Desc_45 />
+			<Char_Desc_80 />
+			<Char_Desc_250 />
+			<Char_Desc_450 />
+			<Char_Desc_2000 />
+		</French>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://dolibarr.com</Application_Info_URL>
+			<Application_Order_URL>http://dolibarr.com</Application_Order_URL>
+			<Application_Screenshot_URL />
+			<Application_Icon_URL />
+			<Application_XML_File_URL>http://dolibarr.com/</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL />
+			<Secondary_Download_URL />
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</PADGEN_PML>
diff --git a/build/pad/pad_dolibarr.htm b/build/pad/pad_dolibarr.htm
index c5d6c33d622..c11fe041a36 100644
Binary files a/build/pad/pad_dolibarr.htm and b/build/pad/pad_dolibarr.htm differ
diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml
index de99ae97e69..135caa50f0c 100644
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -1,103 +1,118 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<XML_DIZ_INFO>
-<MASTER_PAD_VERSION_INFO>
-    <MASTER_PAD_VERSION>1.15</MASTER_PAD_VERSION>
-    <MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO>
-</MASTER_PAD_VERSION_INFO>
-<Company_Info>
-        <Company_Name>Dolibarr Developpers</Company_Name>
-        <Address_1 />
-        <Address_2 />
-        <City_Town />
-        <State_Province />
-        <Zip_Postal_Code />
-        <Country>FRANCE</Country>
-        <Company_WebSite_URL>http://dolibarr.com</Company_WebSite_URL>
-<Contact_Info>
-        <Author_First_Name />
-        <Author_Last_Name />
-        <Author_Email>eldy@users.sourceforge.net</Author_Email>
-        <Contact_First_Name />
-        <Contact_Last_Name />
-        <Contact_Email />
-    </Contact_Info>
-<Support_Info>
-        <Sales_Email />
-        <Support_Email />
-        <General_Email />
-        <Sales_Phone />
-        <Support_Phone />
-        <General_Phone />
-        <Fax_Phone />
-    </Support_Info>
-</Company_Info>
-<Program_Info>
-        <Program_Name>Dolibarr</Program_Name>
-        <Program_Version>2.0</Program_Version>
-        <Program_Release_Month>11</Program_Release_Month>
-        <Program_Release_Day>11</Program_Release_Day>
-        <Program_Release_Year>2005</Program_Release_Year>
-        <Program_Cost_Dollars>0</Program_Cost_Dollars>
-        <Program_Cost_Other_Code />
-        <Program_Cost_Other>0</Program_Cost_Other>
-        <Program_Type>Freeware</Program_Type>
-        <Program_Release_Status>Major Update</Program_Release_Status>
-        <Program_Install_Support>No Install Support</Program_Install_Support>
-        <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,WinXP,Windows2000,Unix,Linux,OS/2,OS/2 Warp,OS/2 Warp 4,MAC 68k,Mac PPC</Program_OS_Support>
-        <Program_Language>French</Program_Language>
-<File_Info>
-        <Filename_Versioned>awstats-62.tgz</Filename_Versioned>
-        <Filename_Previous />
-        <Filename_Generic />
-        <Filename_Long />
-        <File_Size_Bytes>1016660</File_Size_Bytes>
-        <File_Size_K />
-        <File_Size_MB />
-    </File_Info>
-<Expire_Info>
-        <Has_Expire_Info>N</Has_Expire_Info>
-        <Expire_Count />
-        <Expire_Based_On>Days</Expire_Based_On>
-        <Expire_Other_Info />
-        <Expire_Month />
-        <Expire_Day />
-        <Expire_Year />
-    </Expire_Info>
-        <Program_Change_Info>http://dolibarr.com</Program_Change_Info>
-        <Program_Specific_Category>Internet</Program_Specific_Category>
-        <Program_Categories>Log analyzer</Program_Categories>
-        <Program_System_Requirements>None</Program_System_Requirements>
-        <Includes_JAVA_VM>N</Includes_JAVA_VM>
-        <Includes_VB_Runtime>N</Includes_VB_Runtime>
-        <Includes_DirectX>N</Includes_DirectX>
-</Program_Info>
-<Program_Descriptions>
-<English>
-        <Keywords>dolbarr, crm, erp, business, pme, pmi, gestion, factures, facturation, contacts</Keywords>
-        <Char_Desc_45>Dolibarr</Char_Desc_45>
-        <Char_Desc_80>Dolibarr</Char_Desc_80>
-        <Char_Desc_250>Dolibarr</Char_Desc_250>
-        <Char_Desc_450>Dolibarr</Char_Desc_450>
-        <Char_Desc_2000>Dolibarr</Char_Desc_2000>
-</English>
-</Program_Descriptions>
-<Web_Info>
-<Application_URLs>
-        <Application_Info_URL>http://dolibarr.com</Application_Info_URL>
-        <Application_Order_URL />
-        <Application_Screenshot_URL />
-        <Application_Icon_URL />
-        <Application_XML_File_URL>http://dolibarr.com/build/pad/pad_dolibarr.xml</Application_XML_File_URL>
-    </Application_URLs>
-<Download_URLs>
-        <Primary_Download_URL>http://dolibarr.com</Primary_Download_URL>
-        <Secondary_Download_URL />
-        <Additional_Download_URL_1 />
-        <Additional_Download_URL_2 />
-    </Download_URLs>
-</Web_Info>
-<Permissions>
-        <Distribution_Permissions>GNU GPL</Distribution_Permissions>
-        <EULA>GNU GPL</EULA>
-</Permissions>
-</XML_DIZ_INFO>
+<?xml version="1.0" ?>
+<XML_DIZ_INFO>
+	<MASTER_PAD_VERSION_INFO>
+		<MASTER_PAD_VERSION>2.01</MASTER_PAD_VERSION>
+		<MASTER_PAD_EDITOR>PADGen 2.0.1.22 http://www.padgen.org</MASTER_PAD_EDITOR>
+		<MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO>
+	</MASTER_PAD_VERSION_INFO>
+	<Company_Info>
+		<Company_Name>Dolibarr Developpers</Company_Name>
+		<Address_1 />
+		<Address_2 />
+		<City_Town />
+		<State_Province />
+		<Zip_Postal_Code />
+		<Country>FRANCE</Country>
+		<Company_WebSite_URL>http://www.dolibarr.com</Company_WebSite_URL>
+		<Contact_Info>
+			<Author_First_Name />
+			<Author_Last_Name />
+			<Author_Email>dolibarr-dev@nongnu.org</Author_Email>
+			<Contact_First_Name />
+			<Contact_Last_Name />
+			<Contact_Email />
+		</Contact_Info>
+		<Support_Info>
+			<Sales_Email />
+			<Support_Email />
+			<General_Email />
+			<Sales_Phone />
+			<Support_Phone />
+			<General_Phone />
+			<Fax_Phone />
+		</Support_Info>
+	</Company_Info>
+	<Program_Info>
+		<Program_Name>Dolibarr</Program_Name>
+		<Program_Version>2.0</Program_Version>
+		<Program_Release_Month>10</Program_Release_Month>
+		<Program_Release_Day>01</Program_Release_Day>
+		<Program_Release_Year>2005</Program_Release_Year>
+		<Program_Cost_Dollars>0</Program_Cost_Dollars>
+		<Program_Cost_Other_Code />
+		<Program_Cost_Other>0</Program_Cost_Other>
+		<Program_Type>Freeware</Program_Type>
+		<Program_Release_Status>Minor Update</Program_Release_Status>
+		<Program_Install_Support>No Install Support</Program_Install_Support>
+		<Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP,Windows2003,Unix,Linux,OS/2,OS/2 Warp,OS/2 Warp 4,MAC 68k,Mac PPC,Mac OS X,Mac Other,BEOS</Program_OS_Support>
+		<Program_Language>English,French</Program_Language>
+		<Program_Change_Info>http://dolibarr.com</Program_Change_Info>
+		<Program_Specific_Category>Internet</Program_Specific_Category>
+		<Program_Category_Class />
+		<Program_Categories>Log analyzer</Program_Categories>
+		<Program_System_Requirements>None</Program_System_Requirements>
+		<Includes_JAVA_VM>N</Includes_JAVA_VM>
+		<Includes_VB_Runtime>N</Includes_VB_Runtime>
+		<Includes_DirectX>N</Includes_DirectX>
+		<File_Info>
+			<Filename_Versioned>awstats-62.zip</Filename_Versioned>
+			<Filename_Previous>awstats-61.zip</Filename_Previous>
+			<Filename_Generic>awstats-.zip</Filename_Generic>
+			<Filename_Long>awstats.zip</Filename_Long>
+			<File_Size_Bytes>1016660</File_Size_Bytes>
+			<File_Size_K>992</File_Size_K>
+			<File_Size_MB>0.97</File_Size_MB>
+		</File_Info>
+		<Expire_Info>
+			<Has_Expire_Info>N</Has_Expire_Info>
+			<Expire_Count />
+			<Expire_Based_On>Days</Expire_Based_On>
+			<Expire_Other_Info />
+			<Expire_Month />
+			<Expire_Day />
+			<Expire_Year />
+		</Expire_Info>
+	</Program_Info>
+	<Program_Descriptions>
+		<English>
+			<Keywords>dolibarr</Keywords>
+			<Char_Desc_45>Dolibarr ERP/CRM</Char_Desc_45>
+			<Char_Desc_80>Dolibarr ERP/CRM</Char_Desc_80>
+			<Char_Desc_250>Dolibarr ERP/CRM is an open source tool to manage invoices, customers, suppliers, contracts and any other things a small or meidum company need.</Char_Desc_250>
+			<Char_Desc_450>Dolibarr ERP/CRM is an open source tool to manage invoices, customers, suppliers, contracts and any other things a small or meidum company need.</Char_Desc_450>
+			<Char_Desc_2000>Dolibarr ERP/CRM is an open source tool to manage invoices, customers, suppliers, contracts and any other things a small or meidum company need.</Char_Desc_2000>
+		</English>
+		<French>
+			<Keywords />
+			<Char_Desc_45 />
+			<Char_Desc_80 />
+			<Char_Desc_250 />
+			<Char_Desc_450 />
+			<Char_Desc_2000 />
+		</French>
+	</Program_Descriptions>
+	<Web_Info>
+		<Application_URLs>
+			<Application_Info_URL>http://dolibarr.com</Application_Info_URL>
+			<Application_Order_URL>http://dolibarr.com</Application_Order_URL>
+			<Application_Screenshot_URL />
+			<Application_Icon_URL />
+			<Application_XML_File_URL>http://dolibarr.com/</Application_XML_File_URL>
+		</Application_URLs>
+		<Download_URLs>
+			<Primary_Download_URL />
+			<Secondary_Download_URL />
+			<Additional_Download_URL_1 />
+			<Additional_Download_URL_2 />
+		</Download_URLs>
+	</Web_Info>
+	<Permissions>
+		<Distribution_Permissions>GNU GPL</Distribution_Permissions>
+		<EULA>GNU GPL</EULA>
+	</Permissions>
+	<ASP>
+		<ASP_FORM>Y</ASP_FORM>
+		<ASP_Member>N</ASP_Member>
+		<ASP_Member_Number />
+	</ASP>
+</XML_DIZ_INFO>