diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 03e62dd6ba6..1c4e7fc639b 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -197,6 +197,7 @@
         <record id="ch" model="res.country">
             <field name="name">Switzerland</field>
             <field name="code">ch</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(country_name)s'" />
         </record>
         <record id="ci" model="res.country">
             <field name="name">Ivory Coast (Cote D'Ivoire)</field>
@@ -767,6 +768,7 @@
         <record id="ro" model="res.country">
             <field name="name">Romania</field>
             <field name="code">ro</field>
+            <field name="address_format" eval="'%(street)s\n%(street2)s\n%(zip)s %(city)s\n%(state_code)s\n%(country_name)s'" />            
         </record>
         <record id="ru" model="res.country">
             <field name="name">Russian Federation</field>