diff --git a/mozilla/cmd/winfe/genfram2.cpp b/mozilla/cmd/winfe/genfram2.cpp
index acf7da31377..b29d4c2a26e 100644
--- a/mozilla/cmd/winfe/genfram2.cpp
+++ b/mozilla/cmd/winfe/genfram2.cpp
@@ -314,7 +314,8 @@ int16 nIDToCsid(UINT nID)
        CS_8859_9,                  // ID_OPTIONS_ENCODING_17
        CS_UTF8,                    // ID_OPTIONS_ENCODING_18
        CS_UCS2,                    // ID_OPTIONS_ENCODING_19
-       CS_UTF7                     // ID_OPTIONS_ENCODING_20
+       CS_UTF7,                    // ID_OPTIONS_ENCODING_20
+       CS_ARMSCII8		   // ID_OPTIONS_ENCODING_21
      };
 
      if( nID >= ID_OPTIONS_ENCODING_1 && nID <= ID_OPTIONS_ENCODING_70)
diff --git a/mozilla/cmd/winfe/intlwin.cpp b/mozilla/cmd/winfe/intlwin.cpp
index bd28797ce02..2fcfa9779fe 100755
--- a/mozilla/cmd/winfe/intlwin.cpp
+++ b/mozilla/cmd/winfe/intlwin.cpp
@@ -136,6 +136,7 @@ struct FontCharTable  fontchar_tbl[] =
 	CS_GB_8BIT, "Times New Roman", 		12, "Courier New",  10, 134, 134,
 	CS_CP_1250, "Times New Roman", 		12, "Courier New",  10, 238,238,  
 	CS_CP_1251, "Times New Roman", 		12, "Courier New",  10, 204,204,  
+	CS_ARMSCII8, "ArmNet Helvetica",	12, "ArmNet Courier", 10, 160, 160,
 	CS_CP_1253, "Times New Roman", 		12, "Courier New",  10, 161,161,  
 	CS_8859_9, "Times New Roman", 		12, "Courier New",  10, 162,162,  
 	CS_UTF8, 	DEF_PROPORTIONAL_FONT, 	12, DEF_FIXED_FONT, 10, DEFAULT_CHARSET, DEFAULT_CHARSET,
@@ -160,6 +161,7 @@ unsigned int lang_table[] =
 	IDS_LANGUAGE_KOREAN, CS_KSC_8BIT, CS_KSC_8BIT | CS_AUTO, CS_KSC_8BIT, CS_2022_KR, 
                              CS_KSC5601, CS_KSC5601_11, 0,
 	IDS_LANGUAGE_WIN1251, CS_CP_1251, CS_CP_1251, CS_8859_5, CS_KOI8_R, 0,
+	IDS_LANGUAGE_ARMENIAN, CS_ARMSCII8, CS_ARMSCII8, 0,
 	IDS_LANGUAGE_GREEK, CS_CP_1253, CS_CP_1253, CS_8859_7, 0,
 	IDS_LANGUAGE_TURKISH, CS_8859_9, CS_8859_9, 0,
 	IDS_LANGUAGE_UTF8, CS_UTF8, CS_UTF8, CS_UTF7, CS_UCS2, CS_UCS2_SWAP, 0,
diff --git a/mozilla/cmd/winfe/mozilla.rc b/mozilla/cmd/winfe/mozilla.rc
index 94845afcf93..45a6b464f0f 100644
--- a/mozilla/cmd/winfe/mozilla.rc
+++ b/mozilla/cmd/winfe/mozilla.rc
@@ -3039,6 +3039,7 @@ BEGIN
     IDS_LANGUAGE_TAIWANESE  "Traditional Chinese"
     IDS_LANGUAGE_KOREAN     "Korean"
     IDS_LANGUAGE_CHINESE    "Simplified Chinese"
+    IDS_LANGUAGE_ARMENIAN   "Armenian"
 END
 
 STRINGTABLE DISCARDABLE 
diff --git a/mozilla/cmd/winfe/res/editor.rc2 b/mozilla/cmd/winfe/res/editor.rc2
index 85214de09d4..496f306fd5f 100644
--- a/mozilla/cmd/winfe/res/editor.rc2
+++ b/mozilla/cmd/winfe/res/editor.rc2
@@ -131,6 +131,8 @@ BEGIN
             MENUITEM "Cyrillic (ISO-8859-5)",         ID_OPTIONS_ENCODING_13
             MENUITEM "Cyrillic (Windows-1251)",           ID_OPTIONS_ENCODING_12
             MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)",	ID_OPTIONS_ENCODING_21
+            MENUITEM SEPARATOR
 	    MENUITEM "Greek (Windows-1253)",              ID_OPTIONS_ENCODING_16
             MENUITEM "Greek (ISO-8859-7)",            ID_OPTIONS_ENCODING_15
             MENUITEM SEPARATOR
@@ -400,6 +402,8 @@ BEGIN
 	        MENUITEM "Cyrillic (KOI8-R)",            ID_OPTIONS_ENCODING_14
 	        MENUITEM "Cyrillic (ISO-8859-5)",         ID_OPTIONS_ENCODING_13
 	        MENUITEM "Cyrillic (Windows-1251)",           ID_OPTIONS_ENCODING_12
+            MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)",	ID_OPTIONS_ENCODING_21
 	        MENUITEM SEPARATOR
 	        MENUITEM "Greek (Windows-1253)",              ID_OPTIONS_ENCODING_16
 	        MENUITEM "Greek (ISO-8859-7)",            ID_OPTIONS_ENCODING_15
diff --git a/mozilla/cmd/winfe/res/mozilla.rc2 b/mozilla/cmd/winfe/res/mozilla.rc2
index 2244eaf00e7..735c0b3b83e 100644
--- a/mozilla/cmd/winfe/res/mozilla.rc2
+++ b/mozilla/cmd/winfe/res/mozilla.rc2
@@ -414,6 +414,8 @@ BEGIN
             MENUITEM "Cyrillic (ISO-8859-5)",         ID_OPTIONS_ENCODING_13
             MENUITEM "Cyrillic (Windows-1251)",           ID_OPTIONS_ENCODING_12
             MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
+            MENUITEM SEPARATOR
             MENUITEM "Greek (ISO-8859-7)",            ID_OPTIONS_ENCODING_15
             MENUITEM "Greek (Windows-1253)",              ID_OPTIONS_ENCODING_16
             MENUITEM SEPARATOR
@@ -591,7 +593,9 @@ BEGIN
 	//		MENUITEM "Cyrillic (KOI8-R)",            ID_OPTIONS_ENCODING_14
 	//		MENUITEM "Cyrillic (ISO-8859-5)",         ID_OPTIONS_ENCODING_13
 	//		MENUITEM "Cyrillic (Windows-1251)",           ID_OPTIONS_ENCODING_12
-	//		MENUITEM SEPARATOR
+        //    MENUITEM SEPARATOR
+        //    MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
+	//              MENUITEM SEPARATOR
 	//		MENUITEM "Greek (ISO-8859-7)",            ID_OPTIONS_ENCODING_15
 	//		MENUITEM "Greek (Windows-1253)",              ID_OPTIONS_ENCODING_16
 	//		MENUITEM SEPARATOR
@@ -791,6 +795,8 @@ BEGIN
 		MENUITEM "Cyrillic (KOI8-R)",            ID_OPTIONS_ENCODING_14
 		MENUITEM "Cyrillic (ISO-8859-5)",         ID_OPTIONS_ENCODING_13
 		MENUITEM "Cyrillic (Windows-1251)",           ID_OPTIONS_ENCODING_12
+            MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
 		MENUITEM SEPARATOR
 		MENUITEM "Greek (ISO-8859-7)",            ID_OPTIONS_ENCODING_15
 		MENUITEM "Greek (Windows-1253)",              ID_OPTIONS_ENCODING_16
@@ -919,6 +925,8 @@ BEGIN
 	    MENUITEM "Cyrillic (KOI8-R)",            ID_OPTIONS_ENCODING_14
 	    MENUITEM "Cyrillic (ISO-8859-5)",         ID_OPTIONS_ENCODING_13
 	    MENUITEM "Cyrillic (Windows-1251)",           ID_OPTIONS_ENCODING_12
+            MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
 	    MENUITEM SEPARATOR
 	    MENUITEM "Greek (ISO-8859-7)",            ID_OPTIONS_ENCODING_15
 	    MENUITEM "Greek (Windows-1253)",              ID_OPTIONS_ENCODING_16
@@ -2078,6 +2086,8 @@ BEGIN
             MENUITEM "Cyrillic (ISO-8859-5)",       ID_OPTIONS_ENCODING_13
             MENUITEM "Cyrillic (Windows-1251)",     ID_OPTIONS_ENCODING_12
             MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
+            MENUITEM SEPARATOR
             MENUITEM "Greek (ISO-8859-7)",          ID_OPTIONS_ENCODING_15
             MENUITEM "Greek (Windows-1253)",        ID_OPTIONS_ENCODING_16
             MENUITEM SEPARATOR
@@ -2359,6 +2369,8 @@ BEGIN
             MENUITEM "Cyrillic (ISO-8859-5)",       ID_OPTIONS_ENCODING_13
             MENUITEM "Cyrillic (Windows-1251)",     ID_OPTIONS_ENCODING_12
             MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
+            MENUITEM SEPARATOR
             MENUITEM "Greek (ISO-8859-7)",          ID_OPTIONS_ENCODING_15
             MENUITEM "Greek (Windows-1253)",        ID_OPTIONS_ENCODING_16
             MENUITEM SEPARATOR
@@ -2643,6 +2655,8 @@ BEGIN
         MENUITEM "Cyrillic (KOI8-R)",           ID_OPTIONS_ENCODING_14
         MENUITEM "Cyrillic (ISO-8859-5)",       ID_OPTIONS_ENCODING_13
         MENUITEM "Cyrillic (Windows-1251)",     ID_OPTIONS_ENCODING_12
+            MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
         MENUITEM SEPARATOR
         MENUITEM "Greek (ISO-8859-7)",          ID_OPTIONS_ENCODING_15
         MENUITEM "Greek (Windows-1253)",        ID_OPTIONS_ENCODING_16
@@ -2824,6 +2838,8 @@ BEGIN
             MENUITEM "Cyrillic (ISO-8859-5)",       ID_OPTIONS_ENCODING_13
             MENUITEM "Cyrillic (Windows-1251)",     ID_OPTIONS_ENCODING_12
             MENUITEM SEPARATOR
+            MENUITEM "Armenian (ArmSCII-8)", ID_OPTIONS_ENCODING_21
+            MENUITEM SEPARATOR
             MENUITEM "Greek (ISO-8859-7)",          ID_OPTIONS_ENCODING_15
             MENUITEM "Greek (Windows-1253)",        ID_OPTIONS_ENCODING_16
             MENUITEM SEPARATOR
diff --git a/mozilla/cmd/winfe/resource.h b/mozilla/cmd/winfe/resource.h
index 45741ec7610..6f91f64cb38 100755
--- a/mozilla/cmd/winfe/resource.h
+++ b/mozilla/cmd/winfe/resource.h
@@ -3382,6 +3382,7 @@
 #define IDS_LANGUAGE_TAIWANESE          62133
 #define IDS_LANGUAGE_KOREAN             62134
 #define IDS_LANGUAGE_CHINESE            62135
+#define IDS_LANGUAGE_ARMENIAN           62136
 #define IDS_ACCEPTLANG_EN               62137
 #define IDS_ACCEPTLANG_ENUS             62138
 #define IDS_ACCEPTLANG_ENGB             62139