diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b04853d9f6a..6f431b90cba 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -32,6 +32,13 @@ class crm_configuration(osv.osv_memory):
         'group_fund_raising': fields.boolean("Manage Fund Raising",
             implied_group='crm.group_fund_raising',
             help="""Allows you to trace and manage your activities for fund raising."""),
+        'module_crm_claim':fields.boolean("Manage Customer Claims",
+            help="""Allows you to track your customers/suppliers claims and grievances.
+                    This installs the module crm_claim."""),
+        'module_crm_helpdesk':fields.boolean("Manage Helpdesk and Support",
+            help="""Allows you to communicate with Customer,  process Customer query, and provide better help and support. This installs the module crm_helpdesk."""),
+        
+        
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 6330d7a0500..9534c8620ee 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -7,6 +7,22 @@
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
+	            <div name="config_sale" position="before">
+	                <separator string="After-Sale Services"/>
+                    <group>
+                        <label for="id" string="Features"/>
+                        <div>
+                            <div>
+                                <field name="module_crm_claim" class="oe_inline"/>
+                                <label for="module_crm_claim"/>
+                            </div>
+                            <div>
+                                <field name="module_crm_helpdesk" class="oe_inline"/>
+                                <label for="module_crm_helpdesk"/>
+                            </div>
+                        </div>
+                    </group>
+	            </div>
                 <group name="On Mail Client" version="7.0" position="after">
                     <group>
                         <label for="id" string="On Mail Server"/>
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index f5ab836401b..dfc549412d4 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -25,8 +25,10 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'description': """
-This modules allows you to track your customers/suppliers claims and grievances.
+
+Manage Customer Claims.
 ================================================================================
+This application allows you to track your customers/suppliers claims and grievances.
 
 It is fully integrated with the email gateway so that you can create
 automatically new claims based on incoming emails.