diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 45d1bdca12e..61a3869fe1a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8068,7 +8068,7 @@ function picto_from_langcode($codelang, $moreatt = '')
  * Return default language from country code.
  * Return null if not found.
  *
- * @param 	string 	$countrycode	Country code like 'US', 'FR', 'CA', ...
+ * @param 	string 	$countrycode	Country code like 'US', 'FR', 'CA', 'ES', 'MX', ...
  * @return	string					Value of locale like 'en_US', 'fr_FR', ...
  */
 function getLanguageCodeFromCountryCode($countrycode)
@@ -8092,6 +8092,9 @@ function getLanguageCodeFromCountryCode($countrycode)
 		if ($mysoc->country_code == 'DE') {
 			return 'de_CH';
 		}
+		if ($mysoc->country_code == 'IT') {
+			return 'it_CH';
+		}
 	}
 
 	// Locale list taken from:
@@ -8232,6 +8235,7 @@ function getLanguageCodeFromCountryCode($countrycode)
 		'pt-BR',
 		'pt-PT',
 		'rm-CH',
+		'ro-MD',
 		'ro-RO',
 		'ru-RU',
 		'rw-RW',
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 015e6dcfa25..cbc94b4481c 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -84,6 +84,7 @@ Language_nl_NL=Dutch
 Language_pl_PL=Polish
 Language_pt_BR=Portuguese (Brazil)
 Language_pt_PT=Portuguese
+Language_ro_MD=Romanian (Moldavia)
 Language_ro_RO=Romanian
 Language_ru_RU=Russian
 Language_ru_UA=Russian (Ukraine)