diff --git a/addons/caldav/__terp__.py b/addons/caldav/__terp__.py
index 6846ed5801b..208521cdc2f 100644
--- a/addons/caldav/__terp__.py
+++ b/addons/caldav/__terp__.py
@@ -40,7 +40,8 @@
     "init_xml" : [], 
     "demo_xml" : [], 
     "update_xml" : [
-                    'security/ir.model.access.csv'
+                    'security/ir.model.access.csv', 
+                    'caldav_view.xml'
                     ], 
     "installable" : True, 
     "active" : False, 
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
new file mode 100644
index 00000000000..30c8567adee
--- /dev/null
+++ b/addons/caldav/caldav_view.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="view_caldav_set_rrule_wizard" model="ir.ui.view">
+            <field name="name">Add RRule</field>
+            <field name="model">caldav.set.rrule</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add RRule">
+                    <separator string="Select data for Rule" colspan="4"/>
+                    <field name="freq" />
+                    <field name="interval" />
+                    <newline />
+                    <field name="count"
+                    	attrs="{'required' : [('end_date','=',False)]}"/>
+                    <field name="end_date"
+                    	attrs="{'required' : [('count','&lt;=',0)]}"/>
+                    <group col="7" colspan="4" name="Select weekdays"
+                    		attrs="{'invisible' : [('freq','!=','WEEKLY')]}">
+                    	<separator string="" colspan="6" />
+                    	<newline />
+                    	<field name="mo" colspan="1" />
+                    	<field name="tu" colspan="1" />
+                    	<field name="we" colspan="1" />
+                    	<field name="th" colspan="1" />
+                    	<field name="fr" colspan="1" />
+                    	<field name="sa" colspan="1" />
+                    	<field name="su" colspan="1" />
+                    	<newline />
+                    </group>
+                    <group col="4" colspan="4"
+                    			attrs="{'invisible' : [('freq','!=','MONTHLY')]}">
+                    	<separator string="" colspan="6" />
+                    	<newline />
+                    	<field name="day" colspan="1"/>
+                    	<newline />
+                    	<label string="The"/>
+                    	<field name="byday" nolabel="1"
+                    		attrs="{'required' : [('day','&lt;=',0)]}"/>
+                    	<field name="week_list" nolabel="1"
+                    		attrs="{'required' : [('day','&lt;=',0)]}"/>
+                    	<label string="of the Month"/>
+                    	<newline />
+                    </group>
+                    <separator string="" colspan="6" />
+                    <button name="add_rrule" string="Ok" type="object" icon="gtk-ok"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_caldav_set_rrule_wizard" model="ir.actions.act_window">
+            <field name="name">Add RRule</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">caldav.set.rrule</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        
+        
+    </data>
+</openerp>
diff --git a/addons/caldav/common.py b/addons/caldav/common.py
index c5dae055561..9e7c592956c 100644
--- a/addons/caldav/common.py
+++ b/addons/caldav/common.py
@@ -21,6 +21,8 @@
 
 from osv import fields, osv
 from service import web_services
+from tools.translate import _
+import re
 
 def caldevIDs2readIDs(caldev_ID = None):
     if caldev_ID:
@@ -234,4 +236,82 @@ class virtual_wizard(web_services.wizard):
 
 virtual_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+class set_rrule_wizard(osv.osv_memory):
+    _name = "caldav.set.rrule"
+    _description = "Set RRULE"
+
+    _columns = {
+        'freq': fields.selection([('SECONDLY','SECONDLY'),\
+                            ('MINUTELY','MINUTELY'),\
+                            ('HOURLY', 'HOURLY'),\
+                            ('DAILY', 'DAILY'),\
+                            ('WEEKLY','WEEKLY'),\
+                            ('MONTHLY','MONTHLY'),\
+                            ('YEARLY','YEARLY')], 'Frequency', required=True),
+        'interval': fields.integer('Interval'),
+        'count': fields.integer('Count'),
+        'mo': fields.boolean('Mon'),
+        'tu': fields.boolean('Tue'),
+        'we': fields.boolean('Wed'),
+        'th': fields.boolean('Thu'),
+        'fr': fields.boolean('Fri'),
+        'sa': fields.boolean('Sat'),
+        'su': fields.boolean('Sun'),
+        'day': fields.integer('Day of month'),
+        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
+                                       ('WE', 'Wednesday'), ('TH', 'Thursday'),\
+                                       ('FR', 'Friday'), ('SA', 'Saturday'), \
+                                       ('SU', 'Sunday')], 'Weekday' ),
+        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
+                                   ('3', 'Third'), ('4', 'Fourth'), \
+                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day' ),
+        'end_date': fields.date('Repeat Until')
+    }
+
+    _defaults = {
+                 'freq':  lambda *x: 'DAILY', 
+                 }
+
+    def add_rrule(self, cr, uid, ids, context={}):
+        datas = self.read(cr, uid, ids[0])
+        if not context:
+            return {}
+        model = 'crm.case' # for now
+        obj = self.pool.get(model)
+        rrule_string = 'TEMP-value'
+        weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
+        weekstring = ''
+        monthstring = ''
+
+#    logic for computing rrule string
+
+        if datas.get('interval') <= 0:
+            raise osv.except_osv(_('Error!'),("Please select proper Interval"))
+        if datas.get('day') > 31:
+            raise osv.except_osv(_('Error!'),("Please select proper Day of month"))
+        freq = datas.get('freq')
+        if freq == 'WEEKLY':
+            byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
+            weekstring = ';BYDAY=' + ','.join(byday)
+        elif freq == 'MONTHLY':
+            byday = ''
+            if datas.get('byday') and datas.get('week_list'):
+                byday = ';BYDAY=' + datas.get('byday') + datas.get('week_list')
+            monthstring = byday or (';BYMONTHDAY=' + str(datas.get('day'))) 
+        if datas.get('end_date'):
+            datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z'
+        enddate_info = (datas.get('count') and (';COUNT=' +  str(datas.get('count'))) or '' ) +\
+                             ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '')
+
+        rrule_string = 'FREQ=' + freq +  weekstring + ';INTERVAL=' + \
+                    str(datas.get('interval')) + enddate_info + monthstring 
+
+#        End logic 
+        res_obj = obj.browse(cr, uid, context['active_id'])[0]
+        obj.write(cr, uid, [res_obj.id], {'rrule' : rrule_string})
+        return {}
+
+set_rrule_wizard()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: