diff --git a/intl/lwbrk/src/jisx4051class.h b/intl/lwbrk/src/jisx4051class.h
index 412f5f8758dc..70585ac514da 100644
--- a/intl/lwbrk/src/jisx4051class.h
+++ b/intl/lwbrk/src/jisx4051class.h
@@ -54,7 +54,7 @@ static const uint32_t gLBClass20[32] = {
 0x77777711, // U+2048 - U+204F
 0x77777777, // U+2050 - U+2057
 0x57777777, // U+2058 - U+205F
-0x77777777, // U+2060 - U+2067
+0x7777777B, // U+2060 - U+2067
 0x77777777, // U+2068 - U+206F
 0x77777777, // U+2070 - U+2077
 0x77777777, // U+2078 - U+207F
diff --git a/intl/lwbrk/src/nsJISx4051LineBreaker.cpp b/intl/lwbrk/src/nsJISx4051LineBreaker.cpp
index e984fb742ca6..8df98ae27536 100644
--- a/intl/lwbrk/src/nsJISx4051LineBreaker.cpp
+++ b/intl/lwbrk/src/nsJISx4051LineBreaker.cpp
@@ -497,6 +497,8 @@ GetClass(PRUnichar u)
      } else {
        c = CLASS_CHARACTER;
      }
+   } else if (u == 0xfeff) {
+     c = CLASS_NON_BREAKABLE;
    } else {
      c = CLASS_CHARACTER; // others
    }
diff --git a/intl/lwbrk/tools/anzx4051.html b/intl/lwbrk/tools/anzx4051.html
index 53df4c356d36..d894ce811821 100644
--- a/intl/lwbrk/tools/anzx4051.html
+++ b/intl/lwbrk/tools/anzx4051.html
@@ -326,16 +326,16 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
 <TD></TD>
 </TR>
 <TR><TH>07_18<TH>
-<TD>19</TD>
+<TD>18</TD>
 <TD>157</TD>
 <TD></TD>
 <TD>33</TD>
 <TD>56</TD>
 <TD>125</TD>
 <TD>2</TD>
-<TD BGCOLOR=white>392</TD>
+<TD BGCOLOR=white>391</TD>
 <TD></TD>
-<TD>19</TD>
+<TD>18</TD>
 <TD></TD>
 <TD></TD>
 <TD>64</TD>
@@ -482,16 +482,16 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
 <TD></TD>
 </TR>
 <TR><TH>0B_[e]<TH>
-<TD></TD>
+<TD>1</TD>
 <TD></TD>
 <TD></TD>
 <TD></TD>
 <TD>1</TD>
 <TD>1</TD>
 <TD>3</TD>
-<TD BGCOLOR=white>5</TD>
-<TD></TD>
+<TD BGCOLOR=white>6</TD>
 <TD></TD>
+<TD>1</TD>
 <TD></TD>
 <TD></TD>
 <TD></TD>
@@ -629,11 +629,11 @@ Analysis of JIS X 4051 to Unicode General Category Mapping
 <TD>5</TD>
 <TD>13</TD>
 <TD></TD>
-<TD>101</TD>
+<TD>100</TD>
 <TD></TD>
 <TD></TD>
 <TD>7</TD>
-<TD>3</TD>
+<TD>4</TD>
 <TD></TD>
 </TR>
 <TR><TH>21<TH>
diff --git a/intl/lwbrk/tools/jisx4051class.txt b/intl/lwbrk/tools/jisx4051class.txt
index 5c5a4b2c2fb5..5b26b7267863 100644
--- a/intl/lwbrk/tools/jisx4051class.txt
+++ b/intl/lwbrk/tools/jisx4051class.txt
@@ -79,7 +79,8 @@
 2047;2049;3
 204A;205E;18
 205F;;17
-2060;2063;18
+2060;;24
+2061;2063;18
 206A;206F;18
 2070;2071;18
 2074;208E;18