diff --git a/program/localization/index.inc b/program/localization/index.inc
index 76eddc02a..498b96858 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -63,7 +63,7 @@ $rcube_languages = array(
   'ga_IE' => 'Irish (Gaedhilge)',
   'it_IT' => 'Italian (Italiano)',
   'ja_JP' => 'Japanese (日本語)',
-  'kh_KH' => 'Khmer (ភាសាខ្មែរ)',
+  'km_KH' => 'Khmer (ភាសាខ្មែរ)',
   'ko_KR' => 'Korean (한국어)',
   'ku'    => 'Kurdish (Kurmancî)',
   'lv_LV' => 'Latvian (Latviešu)',
@@ -109,6 +109,7 @@ $rcube_language_aliases = array(
   'da' => 'da_DK',
   'de' => 'de_DE',
   'ee' => 'et_EE',
+  'et' => 'et_EE',
   'el' => 'el_GR',
   'en' => 'en_US',
   'eu' => 'eu_ES',
@@ -121,6 +122,8 @@ $rcube_language_aliases = array(
   'ja' => 'ja_JP',
   'ko' => 'ko_KR',
   'kr' => 'ko_KR',
+  'kh' => 'km_KH',
+  'km' => 'km_KH',
   'ne' => 'ne_NP',
   'no' => 'nn_NO',
   'ms' => 'ms_MY',
diff --git a/program/localization/kh_KH/labels.inc b/program/localization/km_KH/labels.inc
similarity index 100%
rename from program/localization/kh_KH/labels.inc
rename to program/localization/km_KH/labels.inc
diff --git a/program/localization/kh_KH/messages.inc b/program/localization/km_KH/messages.inc
similarity index 100%
rename from program/localization/kh_KH/messages.inc
rename to program/localization/km_KH/messages.inc