diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 85de6cfe..427c0664 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -22,7 +22,7 @@ iso8859-6/Compose:		ar_SA.ISO8859-6
 iso8859-6/Compose:		ar_TN.ISO8859-6
 iso8859-6/Compose:		ar_YE.ISO8859-6
 iso8859-9e/Compose:		az_AZ.ISO8859-9E
-koi8-c/Compose:			a3_AZ.KOI8-C
+koi8-c/Compose:			az_AZ.KOI8-C
 microsoft-cp1251/Compose:	be_BY.CP1251
 iso8859-5/Compose:		bg_BG.ISO8859-5
 microsoft-cp1251/Compose:	bg_BG.CP1251
@@ -256,7 +256,6 @@ en_US.UTF-8/Compose:		ar_YE.UTF-8
 en_US.UTF-8/Compose:		bo_IN.UTF-8
 en_US.UTF-8/Compose:		bs_BA.UTF-8
 en_US.UTF-8/Compose:		az_AZ.UTF-8
-en_US.UTF-8/Compose:		a3_AZ.UTF-8
 en_US.UTF-8/Compose:		be_BY.UTF-8
 en_US.UTF-8/Compose:		bg_BG.UTF-8
 en_US.UTF-8/Compose:		bn_IN.UTF-8
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 254c2e04..26a2cba1 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -17,9 +17,11 @@ Cextend.en:					en_US.ISO8859-1
 English_United-States.437:			C
 C.UTF-8:					en_US.UTF-8
 XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
-a3:						a3_AZ.KOI8-C
-a3_AZ:						a3_AZ.KOI8-C
-a3_AZ.koi8c:					a3_AZ.KOI8-C
+a3:						az_AZ.KOI8-C
+a3_AZ:						az_AZ.KOI8-C
+a3_AZ.koi8c:					az_AZ.KOI8-C
+a3_AZ.KOI-C:					az_AZ.KOI8-C
+a3_AZ.UTF-8:					az_AZ.UTF-8
 af:						af_ZA.ISO8859-1
 af_ZA:						af_ZA.ISO8859-1
 af_ZA.iso88591:					af_ZA.ISO8859-1
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index 40fe1a82..fa3c30f0 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -293,7 +293,6 @@ en_US.UTF-8/XLC_LOCALE:			ar_TN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			ar_YE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			as_IN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			az_AZ.UTF-8
-en_US.UTF-8/XLC_LOCALE:			a3_AZ.UTF-8
 en_US.UTF-8/XLC_LOCALE:			be_BY.UTF-8
 en_US.UTF-8/XLC_LOCALE:			bg_BG.UTF-8
 en_US.UTF-8/XLC_LOCALE:			bn_BD.UTF-8