diff --git a/addons/crm/__init__.py b/addons/crm/__init__.py
index e4b80da6ff2..29073ab9e2e 100644
--- a/addons/crm/__init__.py
+++ b/addons/crm/__init__.py
@@ -33,6 +33,7 @@ import crm_helpdesk
 import report
 import wizard
 
+import crm_installer
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index ecf7d33261b..bf705c0fdd0 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -95,6 +95,8 @@ between mails and Open ERP.""",
         'report/crm_phonecall_report_view.xml',
 
         'process/crm_configuration_process.xml',
+        
+        'crm_installer_view.xml', 
     ],
     'demo_xml': [
         'crm_demo.xml',
@@ -103,8 +105,8 @@ between mails and Open ERP.""",
         'crm_opportunity_demo.xml',
         'crm_phonecall_demo.xml'
     ],
-    'test': [
-            'test/test_crm_meeting.yml', 
+    'test1': [
+#            'test/test_crm_meeting.yml', 
             'test/test_crm_lead.yml',
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml', 
diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py
new file mode 100644
index 00000000000..953dc9f3403
--- /dev/null
+++ b/addons/crm/crm_installer.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from operator import itemgetter
+from osv import fields, osv
+import netsvc
+import os
+import pooler
+import tools
+
+
+class crm_installer(osv.osv_memory):
+    _name = 'crm.installer'
+    _inherit = 'res.config.installer'
+    
+    _columns = {
+        'name': fields.char('Name', size=64), 
+        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 
+        'crm_fundraising': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), 
+        'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), 
+        'sale_crm': fields.boolean('Sale CRM Stuff', help="This module relates sale to opportunity cases in the CRM. We suggest you to install this module if you installed both the sale and the crm modules"), 
+    }
+
+crm_installer()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
new file mode 100644
index 00000000000..0bf21cb97d6
--- /dev/null
+++ b/addons/crm/crm_installer_view.xml
@@ -0,0 +1,50 @@
+<openerp>
+  <data>
+    <record id="view_crm_installer" model="ir.ui.view">
+      <field name="name">crm.installer.view</field>
+      <field name="model">crm.installer</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.res_config_installer"/>
+      <field name="arch" type="xml">
+        <data>
+          <form position="attributes">
+            <attribute name="string">CRM Modules Installation</attribute>
+          </form>
+
+          <separator string="title" position="attributes">
+            <attribute name="string"
+                       >Configure Your CRM System</attribute>
+          </separator>
+          <xpath expr="//label[@string='description']"
+                 position="attributes">
+            <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
+          </xpath>
+
+          <group colspan="8">
+            <separator string="Intall Extended modules for CRM" colspan="4"/>
+             <field name="crm_claim"/>
+             <field name="crm_helpdesk"/>
+             <field name="crm_fundraising"/>
+             <field name="crm_caldav"/>
+             <field name="sale_crm"/>
+          </group>
+        </data>
+      </field>
+    </record>
+
+    <record id="action_crm_installer" model="ir.actions.act_window">
+      <field name="name">CRM Modules Installation</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="res_model">crm.installer</field>
+      <field name="view_id" ref="view_crm_installer"/>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="target">new</field>
+    </record>
+
+    <record id="crm_installer_todo" model="ir.actions.todo">
+      <field name="action_id" ref="action_crm_installer"/>
+      <field name="sequence">3</field>
+    </record>
+  </data>
+</openerp>