diff --git a/mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp b/mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp
index db54cea6be5..e402a18c5fc 100644
--- a/mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp
+++ b/mozilla/extensions/spellcheck/src/mozEnglishWordUtils.cpp
@@ -163,7 +163,8 @@ NS_IMETHODIMP mozEnglishWordUtils::GetRootForm(const PRUnichar *aWord, PRUint32
 // This needs vast improvement
 static PRBool ucIsAlpha(PRUnichar c)
 {
-  return (5 == GetCat(c));
+  // XXX we have to fix callers to handle the full Unicode range
+  return (5 == GetCat(PRUint32(c)));
 }
 
 /* void FindNextWord (in wstring word, in PRUint32 length, in PRUint32 offset, out PRUint32 begin, out PRUint32 end); */
@@ -173,6 +174,7 @@ NS_IMETHODIMP mozEnglishWordUtils::FindNextWord(const PRUnichar *word, PRUint32
   const PRUnichar *endbuf = word + length;
   const PRUnichar *startWord=p;
   if(p<endbuf){
+    // XXX These loops should be modified to handle non-BMP characters.
     while((p < endbuf) && (!ucIsAlpha(*p)))
       {
         p++;
diff --git a/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp
index c8cc9c9f171..929640914e9 100644
--- a/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -648,9 +648,13 @@ static inline PRBool IsNonwordChar(PRUnichar chr)
 {
   // a non-word character is one that can end a word, such as whitespace or
   // most punctuation. 
-  // mscott: We probably need to modify this to make it work for non ascii based languages...
-  //         but then again our spell checker doesn't support multi byte languages anyway.
-  return ((chr != '\'') && (GetCat(chr) != 5));
+  // mscott: We probably need to modify this to make it work for non ascii 
+  // based languages...  but then again our spell checker doesn't support 
+  // multi byte languages anyway.
+  // jshin: one way to make the word boundary checker more generic is to
+  // use 'word breaker(s)' in intl.
+  // Need to fix callers (of IsNonwordChar) to pass PRUint32
+  return ((chr != '\'') && (GetCat(PRUint32(chr)) != 5));
 }
 
 // There are certain conditions when we don't want to spell check a node. In particular 
diff --git a/mozilla/intl/unicharutil/public/Makefile.in b/mozilla/intl/unicharutil/public/Makefile.in
index 0f27cb2f15b..6b9522ac921 100644
--- a/mozilla/intl/unicharutil/public/Makefile.in
+++ b/mozilla/intl/unicharutil/public/Makefile.in
@@ -48,7 +48,6 @@ EXPORTS		= \
 		nsICaseConversion.h \
 		nsIOrderIdFormater.h \
 		nsITextTransform.h \
-		nsIUGenCategory.h \
 		nsIUGenDetailCategory.h \
 		nsUnicharUtilCIID.h \
 		nsHankakuToZenkakuCID.h \
diff --git a/mozilla/intl/unicharutil/src/Makefile.in b/mozilla/intl/unicharutil/src/Makefile.in
index e031a7af62f..2cb9aa69c7a 100644
--- a/mozilla/intl/unicharutil/src/Makefile.in
+++ b/mozilla/intl/unicharutil/src/Makefile.in
@@ -53,9 +53,10 @@ REQUIRES	= xpcom \
 		  intl \
 		  $(NULL)
 
+EXPORTS = cattable.h
+
 CPPSRCS		= \
 		nsCaseConversionImp2.cpp \
-		nsCategoryImp.cpp \
 		nsHankakuToZenkaku.cpp \
 		nsEntityConverter.cpp \
 		nsSaveAsCharset.cpp \