diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 442147434bd..d87ee37273f 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -574,7 +574,7 @@
             <field name="code">mh</field>
         </record>
         <record id="mk" model="res.country">
-            <field name="name">Macedonia</field>
+            <field name="name">FYROM</field>
             <field name="code">mk</field>
         </record>
         <record id="ml" model="res.country">
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 04a1bba0ab5..3cb4416d017 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -723,7 +723,7 @@ def get_languages():
         'cs_CZ': u'Czech / Čeština',
         'da_DK': u'Danish / Dansk',
         'de_DE': u'German / Deutsch',
-        'el_EL': u'Greek / Ελληνικά',
+        'el_GR': u'Greek / Ελληνικά',
         'en_CA': u'English (CA)',
         'en_EN': u'English (default)',
         'en_GB': u'English (UK)',