diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index 13cff3de..bb1a11a5 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -1,12 +1,13 @@
 <?php
 
 /**
- * Kolab address book 0.6
+ * Kolab address book
  *
  * Sample plugin to add a new address book source with data from Kolab storage
  * It provides also a possibilities to manage contact folders
  * (create/rename/delete/acl) directly in Addressbook UI.
  *
+ * @version @package_version@
  * @author Thomas Bruederli <roundcube@gmail.com>
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
diff --git a/plugins/kolab_addressbook/package.xml b/plugins/kolab_addressbook/package.xml
new file mode 100644
index 00000000..7e7b84c7
--- /dev/null
+++ b/plugins/kolab_addressbook/package.xml
@@ -0,0 +1,74 @@
+<?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.9.0" 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>kolab_addressbook</name>
+    <uri>http://kolabsys.com</uri>
+	<summary>Kolab addressbook</summary>
+	<description>
+	    Sample plugin to add a new address book source with data from Kolab storage.
+        It provides also a possibilities to manage contact folders
+        (create/rename/delete/acl) directly in Addressbook UI.
+	</description>
+	<lead>
+		<name>Aleksander Machniak</name>
+		<user>machniak</user>
+		<email>machniak@kolabsys.com</email>
+		<active>yes</active>
+	</lead>
+	<lead>
+		<name>Thomas Bruederli</name>
+		<user>bruederli</user>
+		<email>bruederli@kolabsys.com</email>
+		<active>yes</active>
+	</lead>
+	<date>2011-11-01</date>
+	<version>
+		<release>0.6</release>
+		<api>0.6</api>
+	</version>
+	<stability>
+		<release>stable</release>
+		<api>stable</api>
+	</stability>
+	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
+	<notes>-</notes>
+	<contents>
+		<dir baseinstalldir="/" name="/">
+			<file name="kolab_addressbook.php" role="php">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="lib/kolab_addressbook_ui.php" role="php"></file>
+			<file name="lib/rcube_kolab_contacts.php" role="php"></file>
+			<file name="config.inc.php.dist" role="data"></file>
+			<file name="LICENSE" role="data"></file>
+			<file name="skins/default/kolab_addressbook.css" role="data"></file>
+			<file name="skins/default/kolab_folders.gif" role="data"></file>
+			<file name="skins/default/kolab_folders.png" role="data"></file>
+			<file name="skins/default/templates/bookedit.html" role="data"></file>
+
+			<file name="localization/en_US.inc" role="data"></file>
+			<file name="localization/ja_JP.inc" role="data"></file>
+			<file name="localization/pl_PL.inc" role="data"></file>
+			<file name="localization/ru_RU.inc" role="data"></file>
+		</dir>
+		<!-- / -->
+	</contents>
+	<dependencies>
+		<required>
+			<php>
+				<min>5.2.1</min>
+			</php>
+			<pearinstaller>
+				<min>1.7.0</min>
+			</pearinstaller>
+            <package>
+                <name>kolab_core</name>
+                <uri>http://kolabsys.com</uri>
+            </package>
+		</required>
+	</dependencies>
+	<phprelease/>
+</package>
diff --git a/plugins/kolab_config/kolab_config.php b/plugins/kolab_config/kolab_config.php
index 7b0947b0..24d569e3 100644
--- a/plugins/kolab_config/kolab_config.php
+++ b/plugins/kolab_config/kolab_config.php
@@ -6,6 +6,7 @@
  * Plugin to use Kolab server as a configuration storage. Provides an API to handle
  * configuration according to http://wiki.kolab.org/KEP:9.
  *
+ * @version @package_version@
  * @author Machniak Aleksander <machniak@kolabsys.com>
  *
  * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
diff --git a/plugins/kolab_config/package.xml b/plugins/kolab_config/package.xml
new file mode 100644
index 00000000..73291c8d
--- /dev/null
+++ b/plugins/kolab_config/package.xml
@@ -0,0 +1,57 @@
+<?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.9.0" 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>kolab_config</name>
+    <uri>http://kolabsys.com</uri>
+	<summary>Kolab configuration storage</summary>
+	<description>
+        Plugin to use Kolab server as a configuration storage. Provides an API to handle
+        configuration according to http://wiki.kolab.org/KEP:9.
+	</description>
+	<lead>
+		<name>Aleksander Machniak</name>
+		<user>machniak</user>
+		<email>machniak@kolabsys.com</email>
+		<active>yes</active>
+	</lead>
+	<date>2011-11-01</date>
+	<version>
+		<release>1.0</release>
+		<api>1.0</api>
+	</version>
+	<stability>
+		<release>stable</release>
+		<api>stable</api>
+	</stability>
+	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
+	<notes>-</notes>
+	<contents>
+		<dir baseinstalldir="/" name="/">
+			<file name="kolab_config.php" role="php">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="LICENSE" role="data"></file>
+			<file name="lib/configuration.php" role="php"></file>
+			<file name="lib/kolab_configuration.php" role="php"></file>
+		</dir>
+		<!-- / -->
+	</contents>
+	<dependencies>
+		<required>
+			<php>
+				<min>5.2.1</min>
+			</php>
+			<pearinstaller>
+				<min>1.7.0</min>
+			</pearinstaller>
+            <package>
+                <name>kolab_folders</name>
+                <uri>http://kolabsys.com</uri>
+            </package>
+		</required>
+	</dependencies>
+	<phprelease/>
+</package>
diff --git a/plugins/kolab_core/README.txt b/plugins/kolab_core/README
similarity index 100%
rename from plugins/kolab_core/README.txt
rename to plugins/kolab_core/README
diff --git a/plugins/kolab_core/kolab_core.php b/plugins/kolab_core/kolab_core.php
index b027a485..9a2cc1d2 100644
--- a/plugins/kolab_core/kolab_core.php
+++ b/plugins/kolab_core/kolab_core.php
@@ -6,6 +6,7 @@
  * Plugin to setup a basic environment for interaction with a Kolab server.
  * Other Kolab-related plugins will depend on it and can use the static API rcube_core
  *
+ * @version @package_version@
  * @author Thomas Bruederli <roundcube@gmail.com>
  *
  * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
diff --git a/plugins/kolab_core/package.xml b/plugins/kolab_core/package.xml
new file mode 100644
index 00000000..46aa29fe
--- /dev/null
+++ b/plugins/kolab_core/package.xml
@@ -0,0 +1,63 @@
+<?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.9.0" 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>kolab_core</name>
+	<uri>http://kolabsys.com</uri>
+	<summary>Kolab API</summary>
+	<description>
+	    Plugin to setup a basic environment for interaction with a Kolab server.
+        Other Kolab-related plugins will depend on it and can use the static API rcube_kolab.
+	</description>
+	<lead>
+		<name>Thomas Bruederli</name>
+		<user>bruederli</user>
+		<email>bruederli@kolabsys.com</email>
+		<active>yes</active>
+	</lead>
+	<lead>
+		<name>Aleksander Machniak</name>
+		<user>machniak</user>
+		<email>machniak@kolabsys.com</email>
+		<active>yes</active>
+	</lead>
+	<date>2011-11-01</date>
+	<version>
+		<release>1.0</release>
+		<api>1.0</api>
+	</version>
+	<stability>
+		<release>stable</release>
+		<api>stable</api>
+	</stability>
+	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
+	<notes>-</notes>
+	<contents>
+		<dir baseinstalldir="/" name="/">
+			<file name="kolab_core.php" role="php">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="rcube_kolab.php" role="php">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="config.inc.php.dist" role="data"></file>
+			<file name="README" role="data"></file>
+			<file name="LICENSE" role="data"></file>
+		</dir>
+		<!-- / -->
+	</contents>
+	<dependencies>
+		<required>
+			<php>
+				<min>5.2.1</min>
+			</php>
+			<pearinstaller>
+				<min>1.7.0</min>
+			</pearinstaller>
+		</required>
+	</dependencies>
+	<phprelease/>
+</package>
diff --git a/plugins/kolab_folders/README b/plugins/kolab_folders/README
deleted file mode 100644
index eddd5aa5..00000000
--- a/plugins/kolab_folders/README
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Type-aware folder management/listing for Kolab
-
-Author: Aleksander Machniak <machniak@kolabsys.com>
-
-1. About.
----------
-
-The plugin extends folders handling with features of the Kolab Suite.
-With this plugin enabled it is possible to:
- - set/get/change folder's type
- - filter folders list by folder type.
- - style folders list rows (in folder manager)
- - create default folders with specified type
-
-http://www.kolab.org/doc/kolabformat-2.0-html
-
-2. Examples.
-------------
-
-To get list of all folders of type 'event' use code:
-
-$RCMAIL->imap->list_mailboxes('', '*', 'event');
-
-Plugin provides also set_folder_type/get_folder_type methods.
diff --git a/plugins/kolab_folders/kolab_folders.php b/plugins/kolab_folders/kolab_folders.php
index 7622d652..446a091d 100644
--- a/plugins/kolab_folders/kolab_folders.php
+++ b/plugins/kolab_folders/kolab_folders.php
@@ -3,7 +3,7 @@
 /**
  * Type-aware folder management/listing for Kolab
  *
- * @version 0.3
+ * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
diff --git a/plugins/kolab_folders/package.xml b/plugins/kolab_folders/package.xml
new file mode 100644
index 00000000..54ff20b5
--- /dev/null
+++ b/plugins/kolab_folders/package.xml
@@ -0,0 +1,63 @@
+<?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.9.0" 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>kolab_folders</name>
+	<uri>http://kolabsys.com</uri>
+	<summary>Type-aware folder management/listing for Kolab</summary>
+	<description>
+	    The plugin extends folders handling with features of the Kolab Suite
+	    according to specified format (http://www.kolab.org/doc/kolabformat-2.0-html).
+        With this plugin enabled it is possible to:
+        - set/get/change folder's type,
+        - filter folders list by folder type,
+        - style folders list rows (in folder manager),
+        - create default folders with specified type.
+	</description>
+	<lead>
+		<name>Aleksander Machniak</name>
+		<user>machniak</user>
+		<email>machniak@kolabsys.com</email>
+		<active>yes</active>
+	</lead>
+	<date>2011-11-01</date>
+	<version>
+		<release>1.0</release>
+		<api>1.0</api>
+	</version>
+	<stability>
+		<release>stable</release>
+		<api>stable</api>
+	</stability>
+	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
+	<notes>-</notes>
+	<contents>
+		<dir baseinstalldir="/" name="/">
+			<file name="kolab_folders.php" role="php">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="kolab_folders.js" role="data">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="config.inc.php.dist" role="data"></file>
+			<file name="localization/en_US.inc" role="data"></file>
+			<file name="localization/pl_PL.inc" role="data"></file>
+			<file name="LICENSE" role="data"></file>
+		</dir>
+		<!-- / -->
+	</contents>
+	<dependencies>
+		<required>
+			<php>
+				<min>5.2.1</min>
+			</php>
+			<pearinstaller>
+				<min>1.7.0</min>
+			</pearinstaller>
+		</required>
+	</dependencies>
+	<phprelease />
+</package>