diff --git a/addons/project/installer.py b/addons/project/installer.py
index 693e2d58018..470a753c8e0 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class project_installer(osv.osv_memory):
-    _name = 'project.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Project Management
@@ -41,10 +40,10 @@ class project_installer(osv.osv_memory):
         'project_issue': fields.boolean('Issues Tracker',
             help="Automatically synchronizes project tasks and crm cases."),
         # Methodologies
-        'project_scrum': fields.boolean('SCRUM',
+        'project_scrum': fields.boolean('Methodology:SCRUM',
             help="Implements and tracks the concepts and task types defined "
                  "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Getting Things Done',
+        'project_gtd': fields.boolean('Methodology:Getting Things Done',
             help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
     }
 project_installer()
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index c704a980000..af97fff5018 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -3,56 +3,27 @@
 
     <record id="view_project_installer" model="ir.ui.view">
       <field name="name">project.installer.view</field>
-      <field name="model">project.installer</field>
+      <field name="model">base.setup.installer</field>
       <field name="type">form</field>
-      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="inherit_id" ref="base_setup.view_base_setup_installer"/>
       <field name="arch" type="xml">
           <data>
-          <form position="attributes">
-            <attribute name="string">Project Application Configuration</attribute>
-          </form>
-          <separator string="title" position="attributes">
-            <attribute name="string">Configure Your Project Management Application</attribute>
-          </separator>
-           <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                <attribute name='string'></attribute>
-             </xpath>
-          <xpath expr="//label[@string='description']" position="attributes">
-              <attribute name="string">Various OpenERP applications are available to manage your projects with different level of control and flexibility.</attribute>
-          </xpath>
-          <xpath expr="//button[@string='Install Modules']" position="attributes">
-              <attribute name="string">Configure</attribute>
-          </xpath>
-          <group colspan="8">
-            <field name="project_issue"/>
-            <field name="project_long_term" groups="base.group_extended"/>
-            <field name="hr_timesheet_sheet"/>
-            <field name="project_timesheet"/>
-            <field name="account_budget" groups="base.group_extended"/>
+          <xpath expr="//field[@name='product_expiry']" position="after">
             <newline/>
-            <separator string="Methodologies" colspan="4"/>
-            <field name="project_scrum"/>
-            <field name="project_gtd"/>
-          </group>
+            <group attrs="{'invisible': [('project', '=', False)]}" colspan="4">
+                <separator  string="Project Management Detail" colspan="4" />
+            </group>
+                <field name="project_issue" attrs="{'invisible':[('project','=',False)]}"/>
+                <field name="project_long_term" groups="base.group_extended" attrs="{'invisible':[('project','=',False)]}"/>
+                <field name="hr_timesheet_sheet" attrs="{'invisible':[('project','=',False)]}"/>
+                <field name="project_timesheet" attrs="{'invisible':[('project','=',False)]}"/>
+                <field name="account_budget" groups="base.group_extended" attrs="{'invisible':[('project','=',False)]}"/>
+                <field name="project_scrum" attrs="{'invisible':[('project','=',False)]}"/>
+                <field name="project_gtd" attrs="{'invisible':[('project','=',False)]}"/>
+          </xpath>
         </data>
       </field>
     </record>
 
-    <record id="action_project_installer" model="ir.actions.act_window">
-      <field name="name">Project Application Configuration</field>
-      <field name="type">ir.actions.act_window</field>
-      <field name="res_model">project.installer</field>
-      <field name="view_id" ref="view_project_installer"/>
-      <field name="view_type">form</field>
-      <field name="view_mode">form</field>
-      <field name="target">new</field>
-    </record>
-
-    <record id="project_installer_todo" model="ir.actions.todo">
-        <field name="action_id" ref="action_project_installer"/>
-        <field name="type">special</field>
-        <field name="sequence">3</field>
-    </record>
-
   </data>
 </openerp>