diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
index b274593378d..f5ec3261130 100644
--- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
+++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp
@@ -541,9 +541,12 @@ static nsFontCharSetMap gCharSetMap[] =
   { "tis620.2533-1",      &FLG_THAI,    &TIS620        },
   { "tis620-0",           &FLG_THAI,    &TIS620        },
   { "iso8859-11",         &FLG_THAI,    &TIS620        },
-  { "ucs2.cjk-0",         &FLG_NONE,    &Unknown       },
-  { "ucs2.cjk_japan-0",   &FLG_NONE,    &Unknown       },
-  { "ucs2.cjk_taiwan-0",  &FLG_NONE,    &Unknown       },
+  { "ucs2.cjk-0",         &FLG_NONE,    &ISO106461     },
+  { "ucs2.cjk_china-0",   &FLG_ZHCN,    &ISO106461     },
+  { "ucs2.cjk_japan-0",   &FLG_JA,      &ISO106461     },
+  { "ucs2.cjk_korea-0",   &FLG_KO,      &ISO106461     },
+  { "ucs2.cjk_taiwan-0",  &FLG_ZHTW,    &ISO106461     },
+  { "ucs2.thai-0",        &FLG_THAI,    &ISO106461     },
 #ifdef SUNCTL
   { "sun.unicode.india-0",&FLG_INDIC,   &SunIndic      },
 #endif /* SUNCTL */
diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
index 50733766d16..b18954bad6e 100644
--- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
+++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp
@@ -609,9 +609,12 @@ static const nsFontCharSetMapXlib gConstCharSetMap[] =
   { "tis620.2533-1",      &FLG_THAI,    &TIS620        },
   { "tis620-0",           &FLG_THAI,    &TIS620        },
   { "iso8859-11",         &FLG_THAI,    &TIS620        },
-  { "ucs2.cjk-0",         &FLG_NONE,    &Unknown       },
-  { "ucs2.cjk_japan-0",   &FLG_NONE,    &Unknown       },
-  { "ucs2.cjk_taiwan-0",  &FLG_NONE,    &Unknown       },
+  { "ucs2.cjk-0",         &FLG_NONE,    &ISO106461     },
+  { "ucs2.cjk_china-0",   &FLG_ZHCN,    &ISO106461     },
+  { "ucs2.cjk_japan-0",   &FLG_JA,      &ISO106461     },
+  { "ucs2.cjk_korea-0",   &FLG_KO,      &ISO106461     },
+  { "ucs2.cjk_taiwan-0",  &FLG_ZHTW,    &ISO106461     },
+  { "ucs2.thai-0",        &FLG_THAI,    &ISO106461     },
 #ifdef SUNCTL
   { "sun.unicode.india-0",&FLG_INDIC,   &SunIndic      },
 #endif /* SUNCTL */
diff --git a/mozilla/modules/libpref/src/unix/aix.js b/mozilla/modules/libpref/src/unix/aix.js
index 9ff2c6e55f6..94239a43189 100644
--- a/mozilla/modules/libpref/src/unix/aix.js
+++ b/mozilla/modules/libpref/src/unix/aix.js
@@ -49,3 +49,7 @@ pref("font.name.serif.x-cyrillic", "dt-interface system-iso8859-5");
 pref("font.name.sans-serif.x-cyrillic", "dt-interface system-iso8859-5");
 pref("font.name.monospace.x-cyrillic", "dt-interface user-iso8859-5");
 
+// Override default Unicode fonts
+pref("font.name.serif.x-unicode", "dt-interface system-ucs2.cjk_japan-0");
+pref("font.name.sans-serif.x-unicode", "dt-interface system-ucs2.cjk_japan-0");
+pref("font.name.monospace.x-unicode", "dt-interface user-ucs2.cjk_japan-0");