diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py
index 4815721c758..4f65a91acc2 100644
--- a/openerp/addons/base/res/res_company.py
+++ b/openerp/addons/base/res/res_company.py
@@ -145,7 +145,14 @@ class res_company(osv.osv):
         if vat: val.append(_('VAT: ')+vat)
         if reg: val.append(_('Reg: ')+reg)
         return {'value': {'rml_footer1':' | '.join(val)}}
-
+    
+    def on_change_country(self, cr, uid, ids, country_id, context=None):
+        res_country_obj = self.pool.get('res.country')
+        if not country_id:
+            default_currency_id = self._get_euro(cr, uid, context=context)
+            return {'value': {'currency_id': default_currency_id}}
+        currency_id = res_country_obj.browse(cr, uid, country_id, context=context).currency_id.id
+        return {'value': {'currency_id': currency_id}}
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
             context=None, count=False, access_rights_uid=None):
diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml
index c3e2501ccbb..29312fbf782 100644
--- a/openerp/addons/base/res/res_company_view.xml
+++ b/openerp/addons/base/res/res_company_view.xml
@@ -54,7 +54,7 @@
                                             <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" class="oe_no_button"/>
+                                        <field name="country_id" placeholder="Country" class="oe_no_button" on_change="on_change_country(country_id)"/>
                                     </div>
                                     <field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
                                 </group>