diff --git a/plugins/calendar/composer.json b/plugins/calendar/composer.json
new file mode 100644
index 00000000..6bd2b127
--- /dev/null
+++ b/plugins/calendar/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "kolab/calendar",
+    "type": "roundcube-plugin",
+    "description": "Calendar plugin",
+    "homepage": "http://git.kolab.org/roundcubemail-plugins-kolab/",
+    "license": "AGPLv3",
+    "version": "1.1.0",
+    "authors": [
+        {
+            "name": "Thomas Bruederli",
+            "email": "bruederli@kolabsys.com",
+            "role": "Lead"
+        },
+        {
+            "name": "Alensader Machniak",
+            "email": "machniak@kolabsys.com",
+            "role": "Developer"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3",
+        "kolab/libcalendaring": ">=1.1.0"
+    }
+}
diff --git a/plugins/calendar/package.xml b/plugins/calendar/package.xml
deleted file mode 100644
index 5501ac75..00000000
--- a/plugins/calendar/package.xml
+++ /dev/null
@@ -1,177 +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.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>calendar</name>
-    <uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Calendar plugin</summary>
-	<description>-</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Alensader Machniak</name>
-		<user>machniak</user>
-		<email>machniak@kolabsys.com</email>
-		<active>yes</active>
-	</developer>
-	<date>2013-05-16</date>
-	<version>
-		<release>0.9.1</release>
-		<api>0.9.1</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="calendar.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="calendar_base.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="calendar_ui.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="print.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="lib/calendar_ical.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/calendar_itip.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/calendar_ui.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/fullcalendar-rc.patch" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/js/fullcalendar.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="drivers/calendar_driver.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="drivers/kolab/kolab_calendar.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="drivers/kolab/kolab_driver.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="drivers/database/database_driver.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="drivers/database/SQL/mysql.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/SQL/postgresql.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/SQL/sqlite.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/kolab/SQL/mysql.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-
-			<file name="skins/classic/calendar.css" role="data"></file>
-			<file name="skins/classic/fullcalendar.css" role="data"></file>
-			<file name="skins/classic/fullcalendar.print.css" role="data"></file>
-			<file name="skins/classic/iehacks.css" role="data"></file>
-			<file name="skins/classic/jquery.miniColors.css" role="data"></file>
-			<file name="skins/classic/print.css" role="data"></file>
-			<file name="skins/classic/print.iehacks.css" role="data"></file>
-			<file name="skins/classic/images/attendee-status.gif" role="data"></file>
-			<file name="skins/classic/images/badge_confidential.gif" role="data"></file>
-			<file name="skins/classic/images/badge_confidential.png" role="data"></file>
-			<file name="skins/classic/images/badge_private.gif" role="data"></file>
-			<file name="skins/classic/images/badge_private.png" role="data"></file>
-			<file name="skins/classic/images/calendar-blue.png" role="data"></file>
-			<file name="skins/classic/images/calendar.gif" role="data"></file>
-			<file name="skins/classic/images/calendar.png" role="data"></file>
-			<file name="skins/classic/images/calendars.gif" role="data"></file>
-			<file name="skins/classic/images/calendars.png" role="data"></file>
-			<file name="skins/classic/images/eventicons.gif" role="data"></file>
-			<file name="skins/classic/images/export.png" role="data"></file>
-			<file name="skins/classic/images/freebusy-colors.gif" role="data"></file>
-			<file name="skins/classic/images/freebusy-colors.png" role="data"></file>
-			<file name="skins/classic/images/invitation.png" role="data"></file>
-			<file name="skins/classic/images/listheader.gif" role="data"></file>
-			<file name="skins/classic/images/loading_blue.gif" role="data"></file>
-			<file name="skins/classic/images/minicolors-all.png" role="data"></file>
-			<file name="skins/classic/images/minicolors-handles.gif" role="data"></file>
-			<file name="skins/classic/images/preview.png" role="data"></file>
-			<file name="skins/classic/images/print.png" role="data"></file>
-			<file name="skins/classic/images/spacer.gif" role="data"></file>
-			<file name="skins/classic/images/toggle.gif" role="data"></file>
-			<file name="skins/classic/images/toolbar.gif" role="data"></file>
-			<file name="skins/classic/images/toolbar.png" role="data"></file>
-			<file name="skins/classic/templates/attachment.html" role="data"></file>
-			<file name="skins/classic/templates/calendar.html" role="data"></file>
-			<file name="skins/classic/templates/eventedit.html" role="data"></file>
-			<file name="skins/classic/templates/freebusylegend.html" role="data"></file>
-			<file name="skins/classic/templates/itipattend.html" role="data"></file>
-			<file name="skins/classic/templates/kolabacl.html" role="data"></file>
-			<file name="skins/classic/templates/kolabform.html" role="data"></file>
-			<file name="skins/classic/templates/print.html" role="data"></file>
-
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-			<file name="README" role="data"></file>
-			<file name="TODO" role="data"></file>
-
-			<file name="localization/bg_BG.inc" role="data"></file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/hu_HU.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.3.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/libcalendaring/composer.json b/plugins/libcalendaring/composer.json
new file mode 100644
index 00000000..07b8a660
--- /dev/null
+++ b/plugins/libcalendaring/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "kolab/libcalendaring",
+    "type": "roundcube-plugin",
+    "description": "Library providing common functions for calendaring plugins",
+    "homepage": "http://git.kolab.org/roundcubemail-plugins-kolab/",
+    "license": "AGPLv3",
+    "version": "1.1.0",
+    "authors": [
+        {
+            "name": "Thomas Bruederli",
+            "email": "bruederli@kolabsys.com",
+            "role": "Lead"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3"
+    }
+}
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 6eae2df1..9277eaf9 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -6,13 +6,14 @@
  * Provides utility functions for calendar-related modules such as
  * - alarms display and dismissal
  * - attachment handling
- * - recurrence computation and UI elements (TODO)
+ * - recurrence computation and UI elements
  * - ical parsing and exporting
+ * - itip scheduling protocol
  *
  * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
diff --git a/plugins/libkolab/composer.json b/plugins/libkolab/composer.json
new file mode 100644
index 00000000..89260374
--- /dev/null
+++ b/plugins/libkolab/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "kolab/libkolab",
+    "type": "roundcube-plugin",
+    "description": "Plugin to setup a basic environment for the interaction with a Kolab server.",
+    "homepage": "http://git.kolab.org/roundcubemail-plugins-kolab/",
+    "license": "AGPLv3",
+    "version": "1.1.0",
+    "authors": [
+        {
+            "name": "Thomas Bruederli",
+            "email": "bruederli@kolabsys.com",
+            "role": "Lead"
+        },
+        {
+            "name": "Alensader Machniak",
+            "email": "machniak@kolabsys.com",
+            "role": "Developer"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3"
+    }
+}
diff --git a/plugins/libkolab/package.xml b/plugins/libkolab/package.xml
deleted file mode 100644
index cd3e3a02..00000000
--- a/plugins/libkolab/package.xml
+++ /dev/null
@@ -1,101 +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.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>libkolab</name>
-	<uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Kolab core library</summary>
-	<description>Plugin to setup a basic environment for the interaction with a Kolab server.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Alensader Machniak</name>
-		<user>machniak</user>
-		<email>machniak@kolabsys.com</email>
-		<active>yes</active>
-	</developer>
-	<date>2013-04-19</date>
-	<version>
-		<release>0.9</release>
-		<api>0.9</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="libkolab.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_configuration.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_contact.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_distributionlist.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_event.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_file.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_journal.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_note.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_task.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_xcal.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_storage.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_storage_cache.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_storage_folder.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_date_recurrence.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-
-			<file name="bin/modcache.php" role="php"></file>
-
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-			<file name="README" role="data"></file>
-			<file name="UPGRADING" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.3.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>
diff --git a/plugins/tasklist/composer.json b/plugins/tasklist/composer.json
new file mode 100644
index 00000000..ac0b35a7
--- /dev/null
+++ b/plugins/tasklist/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "kolab/tasklist",
+    "type": "roundcube-plugin",
+    "description": "Task management plugin",
+    "homepage": "http://git.kolab.org/roundcubemail-plugins-kolab/",
+    "license": "AGPLv3",
+    "version": "1.1.0",
+    "authors": [
+        {
+            "name": "Thomas Bruederli",
+            "email": "bruederli@kolabsys.com",
+            "role": "Lead"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3",
+        "kolab/libcalendaring": ">=1.1.0"
+    }
+}
diff --git a/plugins/tasklist/package.xml b/plugins/tasklist/package.xml
deleted file mode 100644
index ed0279eb..00000000
--- a/plugins/tasklist/package.xml
+++ /dev/null
@@ -1,92 +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.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>tasklist</name>
-    <uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Task management plugin</summary>
-	<description>-</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-11-21</date>
-	<version>
-		<release>0.9-beta</release>
-		<api>0.9-beta</api>
-	</version>
-	<stability>
-		<release>beta</release>
-		<api>beta</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="tasklist.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="tasklist_ui.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="tasklist_base.js" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="tasklist.js" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="jquery.tagedit.js" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/tasklist_driver.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/kolab/tasklist_kolab_driver.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/tasklist_database_driver.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/SQL/mysql.sql" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			
-			<file name="skins/larry/tasklist.css" role="data"></file>
-			<file name="skins/larry/iehacks.css" role="data"></file>
-			<file name="skins/larry/buttons.png" role="data"></file>
-			<file name="skins/larry/sprites.png" role="data"></file>
-			<file name="skins/larry/templates/mainview.html" role="data"></file>
-			<file name="skins/larry/templates/taskedit.html" role="data"></file>
-			<file name="skins/larry/templates/attachment.html" role="data"></file>
-		</dir>
-		<!-- / -->
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.3.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-			<package>
-			<name>libkolab</name>
-				<uri>http://git.kolab.org/roundcubemail-plugins-kolab/tree/plugins/libkolab</uri>
-			</package>
-			<package>
-				<name>libcalendaring</name>
-				<uri>http://git.kolab.org/roundcubemail-plugins-kolab/tree/plugins/libcalendaring</uri>
-			</package>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>