diff --git a/plugins/calendar/UPGRADING b/plugins/calendar/UPGRADING
new file mode 100644
index 00000000..3038233a
--- /dev/null
+++ b/plugins/calendar/UPGRADING
@@ -0,0 +1,11 @@
+UPGRADING instructions
+======================
+
+From version 0.7 and 0.8
+------------------------
+
+The schemas of the backend databases have changed. Depending on the driver
+you're using, please execute all statements from divers/<driver>/sql/<db>.upgrade-0.7.sql
+on your local database.
+
+
diff --git a/plugins/calendar/drivers/database/sql/mysql.upgrade-0.7.sql b/plugins/calendar/drivers/database/sql/mysql.upgrade-0.7.sql
new file mode 100644
index 00000000..089b06d0
--- /dev/null
+++ b/plugins/calendar/drivers/database/sql/mysql.upgrade-0.7.sql
@@ -0,0 +1,5 @@
+/**
+ * MySQL database updates since version 0.7/0.8
+ **/
+
+ALTER TABLE `events` ADD `sequence` int(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `changed`;
diff --git a/plugins/calendar/drivers/database/sql/postgres.upgrade-0.7.sql b/plugins/calendar/drivers/database/sql/postgres.upgrade-0.7.sql
new file mode 100644
index 00000000..facb1950
--- /dev/null
+++ b/plugins/calendar/drivers/database/sql/postgres.upgrade-0.7.sql
@@ -0,0 +1,5 @@
+/**
+ * Postgres database updates since version 0.7/0.8
+ **/
+
+ALTER TABLE events ADD sequence integer NOT NULL DEFAULT 0;
diff --git a/plugins/calendar/drivers/kolab/SQL/mysql.upgrade-0.7.sql b/plugins/calendar/drivers/kolab/SQL/mysql.upgrade-0.7.sql
new file mode 100644
index 00000000..da567b61
--- /dev/null
+++ b/plugins/calendar/drivers/kolab/SQL/mysql.upgrade-0.7.sql
@@ -0,0 +1,15 @@
+/**
+ * Kolab backend SQL updates
+ **/
+
+DROP TABLE IF EXISTS `kolab_alarms`;
+
+CREATE TABLE `kolab_alarms` (
+  `event_id` VARCHAR(255) NOT NULL,
+  `user_id` int(10) UNSIGNED NOT NULL,
+  `notifyat` DATETIME DEFAULT NULL,
+  `dismissed` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY(`event_id`),
+  CONSTRAINT `fk_kolab_alarms_user_id` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) /*!40000 ENGINE=INNODB */;
diff --git a/plugins/calendar/package.xml b/plugins/calendar/package.xml
index c422d2a7..881ce650 100644
--- a/plugins/calendar/package.xml
+++ b/plugins/calendar/package.xml
@@ -1,188 +1,188 @@
 <?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>2012-12-16</date>
+	<date>2012-11-08</date>
 	<version>
-		<release>0.8-alpha</release>
-		<api>0.9-alpha</api>
+		<release>0.9-beta</release>
+		<api>0.9-beta</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_recurrence.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/Horde_Date.php" role="php"></file>
 			<file name="lib/Horde_Date_Recurrence.php" role="php"></file>
 			<file name="lib/Horde_iCalendar.php" role="php"></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="lib/jquery.miniColors.min.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>