diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index cd8b5918a40..04f5a6004a7 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -4,6 +4,7 @@
 		
         <record model="document.directory" id="document.dir_calendars">
             <field name="name">Calendars</field>
+            <field name="calendar_collection">True</field>
         </record>
 
 		<!--		Event attributes-->
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 794308daa99..152baf6c876 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -1,6 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
+        <record model="ir.ui.view" id="view_calendar_collection_form">
+        <field name="name">Calendar Collections : Form</field>
+        <field name="model">document.directory</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Calendar Collections">
+                <field name="name" select="1" colspan="4"/>
+                <field name="user_id"/>
+                <field name="parent_id"/>
+                <field name="calendar_ids" colspan="4" nolabel="1"/>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_calendar_collection_tree">
+        <field name="name">Calendar Collections : Tree</field>
+        <field name="model">document.directory</field>
+        <field name="type">tree</field>
+        <field name="field_parent">child_ids</field>
+        <field name="arch" type="xml">
+            <tree string="Calendar Collections" toolbar="1">
+                <field name="name"/>                
+                <field name="user_id"/>
+                <field name="create_date"/>
+                <field name="write_date"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_calendar_collection_form">
+        <field name="name">Calendar Collections</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">document.directory</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('calendar_collection','=',True)]</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="document.action_document_directory_form">
+        <field name="domain">[('calendar_collection','=',False)]</field>
+    </record>
+
+    <record id="action_dir_view1" model="ir.actions.act_window.view">
+        <field eval="10" name="sequence"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_calendar_collection_tree"/>
+        <field name="act_window_id" ref="action_calendar_collection_form"/>
+    </record>
+    <record id="action_dir_view2" model="ir.actions.act_window.view">
+        <field eval="20" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_calendar_collection_form"/>
+        <field name="act_window_id" ref="action_calendar_collection_form"/>
+    </record>
+    
+    <menuitem        
+        id="menu_calendar"
+        name="Calendar"
+        parent="base.menu_document_configuration"/>
+
+    <menuitem
+        action="action_calendar_collection_form"
+        id="menu_calendar_collection"
+        parent="menu_calendar"/>
+
         <record model="ir.ui.view" id="view_caldav_form">
             <field name="name">Calendar : Form</field>
             <field name="model">basic.calendar</field>
@@ -81,6 +145,6 @@
     <menuitem
         action="action_caldav_form"
         id="menu_caldav_directories"
-        parent="document.menu_document_management_configuration"/>
+        parent="menu_calendar"/>
 	</data>
 </openerp>
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index fb4eb35ca8d..bcf7eb58d76 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -413,8 +413,13 @@ class CalDAV(object):
 class calendar_collection(osv.osv):
     _inherit = 'document.directory' 
     _columns = {
+        'calendar_collection' : fields.boolean('Calendar Collection'),
         'calendar_ids': fields.one2many('basic.calendar', 'collection_id', 'Calendars'),
     }
+    _default = {
+        'calendar_collection' : False,
+    }
+    
 calendar_collection()
 
 class Calendar(CalDAV, osv.osv):