diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 937c9cbd20b..590d3b11a87 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -36,7 +36,7 @@ The kernel of OpenERP, needed for all installation.
     'data': [
         'base_data.xml',
         'currency_data.xml',
-        'country_data.xml',
+        'res/res_country_data.xml',
         'security/base_security.xml',
         'base_menu.xml',
         'res/res_security.xml',
diff --git a/openerp/addons/base/country_data.xml b/openerp/addons/base/res/res_country_data.xml
similarity index 99%
rename from openerp/addons/base/country_data.xml
rename to openerp/addons/base/res/res_country_data.xml
index d4d880cb8ed..068850727e8 100644
--- a/openerp/addons/base/country_data.xml
+++ b/openerp/addons/base/res/res_country_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
- 
+
         <record id="ad" model="res.country">
             <field name="name">Andorra, Principality of</field>
             <field name="code">ad</field>
@@ -106,7 +106,7 @@
         <record id="be" model="res.country">
             <field name="name">Belgium</field>
             <field name="code">be</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="bf" model="res.country">
@@ -386,7 +386,7 @@
         <record id="fr" model="res.country">
             <field name="name">France</field>
             <field name="code">fr</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="ga" model="res.country">
@@ -532,7 +532,7 @@
         <record id="in" model="res.country">
             <field name="name">India</field>
             <field name="code">in</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(zip)s\n%(state_name)s\n%(country_name)s'" />
             <field name="currency_id" ref="INR"/>
         </record>
         <record id="io" model="res.country">
@@ -838,7 +838,7 @@
         <record id="nl" model="res.country">
             <field name="name">Netherlands</field>
             <field name="code">nl</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
             <field name="currency_id" ref="EUR"/>
         </record>
         <record id="no" model="res.country">
@@ -1174,7 +1174,7 @@
         </record>
         <record id="uk" model="res.country">
             <field name="name">United Kingdom</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s\n%(state_name)s\n%(zip)s\n%(country_name)s'" />
             <field name="code">gb</field>
             <field name="currency_id" ref="GBP"/>
         </record>
@@ -1186,7 +1186,7 @@
         <record id="us" model="res.country">
             <field name="name">United States</field>
             <field name="code">us</field>
-            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />            
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s'" />
             <field name="currency_id" ref="USD"/>
         </record>
         <record id="uy" model="res.country">
@@ -1281,5 +1281,5 @@
             <field name="code">zw</field>
             <field name="currency_id" ref="ZWD"/>
         </record>
-	</data>
+    </data>
 </openerp>