diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index 7acc9806a63..2193af992a8 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -14,52 +14,22 @@
 
         <record id="view_marketing_installer" model="ir.ui.view">
             <field name="name">marketing.installer.view</field>
-            <field name="model">marketing.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">Marketing Application Configuration</attribute>
-                  </form>
-                  <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Marketing Application</attribute>
-                  </separator>
-                  <xpath expr="//label[@string='description']"
-                         position="attributes">
-                    <attribute name="string">OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in.</attribute>
-                  </xpath>
-                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                       <attribute name='rowspan'>13</attribute>
-                       <attribute name='string'></attribute>
-                 </xpath>
-                  <xpath expr="//button[@string='Install Modules']" position="attributes">
-                            <attribute name="string">Configure</attribute>
-                  </xpath>
-                  <group colspan="8">
-                        <field name="marketing_campaign" />
-                        <field name="email_template" />
-                        <field name="crm_profiling" />
-                  </group>
+                    <xpath expr="//field[@name='product_expiry']" position="after">
+                        <newline/>
+                        <group attrs="{'invisible': [('marketing', '=', False)]}" colspan="4">
+                            <separator  string="Marketing Details" colspan="4" />
+                        </group>
+                        <field name="marketing_campaign" attrs="{'invisible': [('marketing', '=', False)]}"/>
+                        <field name="email_template" attrs="{'invisible': [('marketing', '=', False)]}"/>
+                        <field name="crm_profiling" attrs="{'invisible': [('marketing', '=', False)]}"/>
+                    </xpath>                   
                 </data>
             </field>
         </record>
-
-        <record id="action_marketing_installer" model="ir.actions.act_window">
-            <field name="name">Marketing Applications Configuration</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">marketing.installer</field>
-            <field name="view_id" ref="view_marketing_installer"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="marketing_installer_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_marketing_installer"/>
-            <field name="sequence">3</field>
-            <field name="type">special</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/marketing/marketing_wizard.py b/addons/marketing/marketing_wizard.py
index a97d0ca16bc..cedba8151c9 100644
--- a/addons/marketing/marketing_wizard.py
+++ b/addons/marketing/marketing_wizard.py
@@ -22,8 +22,7 @@
 from osv import fields, osv
 
 class marketing_installer(osv.osv_memory):
-    _name = 'marketing.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
     _columns = {
         'email_template':fields.boolean('Automated E-Mails',
             help="Helps you to design templates of emails and integrate them in your different processes."),