diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 2dbb136eb4b..80bc8953cb5 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1276,7 +1276,7 @@
             <field name="type">default</field>
             <field model="res.country" name="country_id" ref="be"/>
         </record>
-        
+       
         <!-- Currencies -->
         <record id="EUR" model="res.currency">
             <field name="name">EUR</field>
@@ -1314,7 +1314,6 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
         
-        
         <record id="CAD" model="res.currency">
             <field name="name">CAD</field>
             <field name="code">CAD</field>
@@ -1485,7 +1484,7 @@
             <field eval="False" name="active"/>
         </record>
         
-        
+        <!-- Basic Company  -->
         <record id="main_company" model="res.company">
             <field name="name">Tiny sprl</field>
             <field name="partner_id" ref="main_partner"/>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 8aaf6384a11..acc9d9fd4cd 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -151,9 +151,6 @@
                             <separator colspan="4" string="Your Logo - Use a size of about 450x150 pixels."/>
                             <field colspan="4" name="logo" widget="image"/>
                         </page>
-                        <page string="Currency">
-                            <field colspan="4" name="currency_ids" nolabel="1"/>
-                        </page>
                         <page string="Header/Footer">
                             <field colspan="4" name="rml_header" nolabel="1"/>
                         </page>
diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py
index ca5daaf203e..f7e6f94c342 100644
--- a/bin/addons/base/res/res_company.py
+++ b/bin/addons/base/res/res_company.py
@@ -46,7 +46,6 @@ class res_company(osv.osv):
         'rml_header2' : fields.text('RML Internal Header'),
         'logo' : fields.binary('Logo'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-        'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency Rates'),
     }
     
     def _get_child_ids(self, cr, uid, uid2, context={}):
diff --git a/bin/addons/base/res/res_currency.py b/bin/addons/base/res/res_currency.py
index 7de0c9d769d..05541689154 100644
--- a/bin/addons/base/res/res_currency.py
+++ b/bin/addons/base/res/res_currency.py
@@ -64,7 +64,6 @@ class res_currency(osv.osv):
         'accuracy': fields.integer('Computational Accuracy'),
         'rounding': fields.float('Rounding factor', digits=(12,6)),
         'active': fields.boolean('Active'),
-        'company_id' : fields.many2one('res.company', 'Company'),
     }
     _defaults = {
         'active': lambda *a: 1,
diff --git a/bin/addons/base/res/res_currency_view.xml b/bin/addons/base/res/res_currency_view.xml
index cc804d8b80e..ccd75eabf7f 100644
--- a/bin/addons/base/res/res_currency_view.xml
+++ b/bin/addons/base/res/res_currency_view.xml
@@ -23,8 +23,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Currency">
-                    <field name="name" select="1"/>
-                    <field name="company_id" select="2"/>
+                    <field name="name" select="1" colspan="4"/>
                     <field name="code" select="1"/>
                     <field name="rate"/>
                     <field name="rounding"/>