diff --git a/bin/addons/base/maintenance/maintenance.py b/bin/addons/base/maintenance/maintenance.py
index 589bd18354c..98c42cc47f9 100755
--- a/bin/addons/base/maintenance/maintenance.py
+++ b/bin/addons/base/maintenance/maintenance.py
@@ -40,15 +40,15 @@ class maintenance_contract(osv.osv):
     _name = "maintenance.contract"
     _description = "Maintenance Contract"
     _columns = {
-    'name' : fields.char('Name', size=256),
-    'contract_date' : fields.date('Date'),
-    'password' : fields.char('password', size=64, invisible=True),
-        }
-
+        'name' : fields.char('Contract ID', size=256, required=True),
+        'password' : fields.char('password', size=64, invisible=True, required=True),
+        'date_start' : fields.date('Starting Date', readonly=True),
+        'date_stop' : fields.date('Ending Date', readonly=True),
+        'modules': fields.text('Covered Modules')
+    }
     _defaults = {
         'password' : lambda obj,cr,uid,context={} : '',
-        'contract_date':lambda *a: time.strftime('%Y-%m-%d'),
-              }
+    }
     def _test_maintenance(self, cr, uid, ids, context):
         remote_db='trunk'
         remote_server='localhost'
diff --git a/bin/addons/base/maintenance/maintenance_view.xml b/bin/addons/base/maintenance/maintenance_view.xml
index 3122e8c3bf6..81af7270f71 100755
--- a/bin/addons/base/maintenance/maintenance_view.xml
+++ b/bin/addons/base/maintenance/maintenance_view.xml
@@ -9,7 +9,8 @@
             <field name="arch" type="xml">
                 <tree string="Maintenance Contract">
                     <field name="name"/>
-                    <field name="contract_date"/>
+                    <field name="date_start"/>
+                    <field name="date_stop"/>
                 </tree>
             </field>
         </record>
@@ -20,22 +21,41 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Maintenance Contract">
+                    <separator string="Information" colspan="4"/>
                     <field name="name" select="1"/>
                     <field name="password" password="True"/>
-                    <field name="contract_date" select="1"/>
+                    <field name="date_start" select="1"/>
+                    <field name="date_stop" select="1"/>
                     <button name="_test_maintenance" string="Check Maintenance" type="object" colspan="2"/>
+                    <separator string="Covered Modules" colspan="4"/>
+                    <field name="modules" nolabel="1" colspan="4"/>
                 </form>
             </field>
         </record>
 
         <record id="action_maintenance_contract_form" model="ir.actions.act_window">
-            <field name="name">Maintenance Contract</field>
+            <field name="name">Your Maintenance Contracts</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">maintenance.contract</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_maintenance_contract_form" id="menu_maintenance_contract" parent="base.menu_management"/>
+        <record id="action_maintenance_contract_form" model="ir.actions.act_window">
+            <field name="name">Encode a New Maintenance Contract</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">maintenance.contract</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem
+            string="Maintenance"
+            id="maintenance"
+            parent="base.menu_administration"/>
+
+        <menuitem
+            action="action_maintenance_contract_form"
+            id="menu_maintenance_contract"
+            parent="maintenance"/>
 
     </data>
 </openerp>