diff --git a/mozilla/lib/libi18n/csnametb.c b/mozilla/lib/libi18n/csnametb.c
index 845e855d399..65993c0b1d2 100644
--- a/mozilla/lib/libi18n/csnametb.c
+++ b/mozilla/lib/libi18n/csnametb.c
@@ -75,6 +75,7 @@ MODULE_PRIVATE csname2id_t csname2id_tbl[] = {
 			{"ISO-10646-UCS-2", "UCS2", CS_UCS2},
 			{"ISO-10646-UCS-4", "UCS4", CS_UCS4},
 			{"x-imap4-modified-utf7", "", CS_IMAP4_UTF7},
+			{"armscii-8", "", CS_ARMSCII8},
 
 #ifdef XP_OS2
 	/* Additional OS/2 codepages. These are IANA primary names */
diff --git a/mozilla/lib/libi18n/fe_ccc.c b/mozilla/lib/libi18n/fe_ccc.c
index 7ca6a2a0855..ab8030c9504 100644
--- a/mozilla/lib/libi18n/fe_ccc.c
+++ b/mozilla/lib/libi18n/fe_ccc.c
@@ -271,6 +271,9 @@ MODULE_PRIVATE cscvt_t		cscvt_tbl[] = {
 		{CS_KOI8_R,		CS_CP_1251,		0, (CCCFunc)One2OneCCC,		0},
 		{CS_CP_1251,	CS_KOI8_R,		0, (CCCFunc)One2OneCCC,		0},
 
+		/* ARMENIAN */
+		{CS_ARMSCII8, CS_ARMSCII8,		0, (CCCFunc)0, 0},
+
 		/* GREEK */
 		{CS_CP_1253,	CS_CP_1253,		0,	(CCCFunc)0,				0},
 		{CS_CP_1253,	CS_8859_7,		0,	(CCCFunc)One2OneCCC,	0},
@@ -449,10 +452,12 @@ MODULE_PRIVATE cscvt_t		cscvt_tbl[] = {
 
 		{CS_CP_1251,		CS_8859_5,		0, (CCCFunc)One2OneCCC, 0},	
 		{CS_8859_5,		CS_CP_1251,		0, (CCCFunc)One2OneCCC, 0},	
-
 		{CS_CP_1251,		CS_KOI8_R,		0, (CCCFunc)One2OneCCC, 0},	
 		{CS_KOI8_R,		CS_CP_1251,		0, (CCCFunc)One2OneCCC, 0},	
 
+		/* ARMENIAN */
+		{CS_ARMSCII8, CS_ARMSCII8,		0, (CCCFunc)0, 0},
+
 		/* GREEK */
 		{CS_8859_7,		CS_8859_7,		0, NULL,			0},	
 		{CS_8859_7,		CS_CP_1253,		0, (CCCFunc)One2OneCCC,	0},
diff --git a/mozilla/lib/libi18n/sblower.c b/mozilla/lib/libi18n/sblower.c
index 30b02b07efb..c6f77b58507 100644
--- a/mozilla/lib/libi18n/sblower.c
+++ b/mozilla/lib/libi18n/sblower.c
@@ -570,6 +570,24 @@ PRIVATE unsigned char lower_macroman[128] = {
 };
 #endif
 
+/* 
+  ToLower translation for Armenian (ArmSCII-8):
+
+    0x80..0xB1  -  unchanged
+    0xB2..0xFE  -  set the lower bit
+*/
+
+PRIVATE unsigned char lower_armscii8[128] = {
+	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 
+	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 
+	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 
+	0xb0, 0xb1, 0xb3, 0xb3, 0xb5, 0xb5, 0xb7, 0xb7, 0xb9, 0xb9, 0xbb, 0xbb, 0xbd, 0xbd, 0xbf, 0xbf, 
+	0xc0, 0xc1, 0xc3, 0xc3, 0xc5, 0xc5, 0xc7, 0xc7, 0xc9, 0xc9, 0xcb, 0xcb, 0xcd, 0xcd, 0xcf, 0xcf, 
+	0xd0, 0xd1, 0xd3, 0xd3, 0xd5, 0xd5, 0xd7, 0xd7, 0xd9, 0xd9, 0xdb, 0xdb, 0xdd, 0xdd, 0xdf, 0xdf, 
+	0xe0, 0xe1, 0xe3, 0xe3, 0xe5, 0xe5, 0xe7, 0xe7, 0xe9, 0xe9, 0xeb, 0xeb, 0xed, 0xed, 0xef, 0xef, 
+	0xf0, 0xf1, 0xf3, 0xf3, 0xf5, 0xf5, 0xf7, 0xf7, 0xf9, 0xf9, 0xfb, 0xfb, 0xfd, 0xfd, 0xff, 0x7f };
+
+
 MODULE_PRIVATE unsigned char *INTL_GetSingleByteToLowerMap(int16 csid)
 {
 	switch(csid)
@@ -641,6 +659,9 @@ MODULE_PRIVATE unsigned char *INTL_GetSingleByteToLowerMap(int16 csid)
 #endif	
 		case CS_KOI8_R:
 			return lower_lookup_koi8_r;
+		case CS_ARMSCII8:
+			return lower_armscii8;
+
 		/* currently, return the ascii table. We should supply table for this csid later */
 		
 		case CS_8859_3:	
diff --git a/mozilla/lib/libi18n/ucs2.c b/mozilla/lib/libi18n/ucs2.c
index e4f6bcb75df..805bf04139c 100644
--- a/mozilla/lib/libi18n/ucs2.c
+++ b/mozilla/lib/libi18n/ucs2.c
@@ -139,6 +139,14 @@ PRIVATE uint16 cp1251ToTbl[] = {
 #include "cp1251.ut"
 };
 /*--------------------------------------------------------------------------*/
+/*	ArmSCII		*/
+PRIVATE uint16 armsciiFromTbl[] = {
+#include "armscii.uf"
+};
+PRIVATE uint16 armsciiToTbl[] = {
+#include "armscii.ut"
+};
+/*--------------------------------------------------------------------------*/
 /*	Japanese stuff */
 PRIVATE uint16 JIS0208FromTbl[] = {
 #include "jis0208.uf"
@@ -255,10 +263,14 @@ PRIVATE uTable* LoadToUCS2Table(uint16 csid)
 		
 	case CS_KOI8_R:
 		return (uTable*) koi8rToTbl;
-
+		
 	case CS_CP_1251:
 		return (uTable*) cp1251ToTbl;
 		
+	/*	ArmSCII		*/
+	case CS_ARMSCII8:
+		return (uTable*) armsciiToTbl;
+
 	/*	Japanese */
 	case CS_JISX0208:
 		return (uTable*) JIS0208ToTbl;
@@ -338,6 +350,10 @@ PRIVATE uTable* LoadFromUCS2Table(uint16 csid)
 	case CS_CP_1251:
 		return (uTable*) cp1251FromTbl;
 		
+	/*	ArmSCII		*/
+	case CS_ARMSCII8:
+		return (uTable*) armsciiFromTbl;
+
 	/*	Japanese */
 	case CS_JISX0208:
 		return (uTable*) JIS0208FromTbl;
diff --git a/mozilla/lib/libi18n/ugendata.c b/mozilla/lib/libi18n/ugendata.c
index 52e937df48f..a7d16060e79 100644
--- a/mozilla/lib/libi18n/ugendata.c
+++ b/mozilla/lib/libi18n/ugendata.c
@@ -157,7 +157,7 @@ PRIVATE	int16*	strShiftTable[MAXCSIDINTBL] =
 	0,			0,			utf8ShiftT,	0,				0,			big5ShiftT,	0,			sbShiftT,
 	sbShiftT,	sbShiftT,	sbShiftT,	sbShiftT,		sbShiftT,	sbShiftT,	sbShiftT,			0,
 	0,			0,			0,			0,				0,			0,			0,			0,
-	0,			0,			0,			0,				0,			0,			sbShiftT,	0
+	0,	0,	0,	0,	0,	0,	sbShiftT,	sbShiftT
 };
 
 PRIVATE UnicodeTableSet unicodetableset[] =
@@ -310,9 +310,9 @@ MODULE_PRIVATE UnicodeTableSet* GetUnicodeTableSet(uint16 csid)
 -----------------------------------------------------------------------------------*/
 MODULE_PRIVATE uShiftTable* GetShiftTableFromCsid(uint16 csid)
 {
-	return (uShiftTable*)(strShiftTable[csid & 0x3F]);
+	return (uShiftTable*)(strShiftTable[csid & 0x3F]); 
 }
 MODULE_PRIVATE uShiftTable* InfoToShiftTable(unsigned char info)
 {
-	return (uShiftTable*)(npcShiftTable[info & (MAXCSIDINTBL - 1)]);
+	return (uShiftTable*)(npcShiftTable[info & (MAXCSIDINTBL - 1)]); 
 }