diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index a7e5e20..c9db004 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -2329,7 +2329,7 @@
 +                    newtab_length = 1;
 +                  }
 +
-+                if (optarg[tab_length])
++                if (optarg[newtab_length])
 +		  {
 +		    /* Provoke with `sort -txx'.  Complain about
 +		       "multi-character tab" instead of "multibyte tab", so
@@ -3585,7 +3585,7 @@
    xfields (line);
    return true;
  }
-@@ -336,56 +502,116 @@
+@@ -336,56 +502,114 @@
  keycmp (struct line const *line1, struct line const *line2)
  {
    /* Start of field to compare in each file.  */
@@ -3712,10 +3712,8 @@
 +      copy[1] = (unsigned char *) beg[1];
      }
  
-+#ifdef HAVE_MBRTOWC
-+  if (MB_CUR_MAX > 1)
++  if (HAVE_SETLOCALE && hard_LC_COLLATE)
 +    return xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]);
-+#endif
 +  diff = memcmp (copy[0], copy[1], MIN (len[0], len[1]));
 +
    if (diff)
@@ -3725,7 +3723,7 @@
  }
  
  /* Print field N of LINE if it exists and is nonempty, otherwise
-@@ -410,11 +636,18 @@
+@@ -410,11 +634,18 @@
  
  /* Print the join of LINE1 and LINE2.  */
  
@@ -3745,7 +3743,7 @@
  
    outlist = outlist_head.next;
    if (outlist)
-@@ -430,12 +663,12 @@
+@@ -430,12 +661,12 @@
  	  if (o->file == 0)
  	    {
  	      if (line1 == &uni_blank)
@@ -3760,7 +3758,7 @@
  		  line = line1;
  		  field = join_field_1;
  		}
-@@ -449,7 +682,7 @@
+@@ -449,7 +680,7 @@
  	  o = o->next;
  	  if (o == NULL)
  	    break;
@@ -3769,7 +3767,7 @@
  	}
        putchar ('\n');
      }
-@@ -467,23 +700,23 @@
+@@ -467,23 +698,23 @@
        prfield (join_field_1, line1);
        for (i = 0; i < join_field_1 && i < line1->nfields; ++i)
  	{
@@ -3797,7 +3795,7 @@
  	  prfield (i, line2);
  	}
        putchar ('\n');
-@@ -678,7 +911,7 @@
+@@ -678,7 +909,7 @@
  	  valid = true;
  	}
        else
@@ -3806,7 +3804,7 @@
  	  /* `0' must be all alone -- no `.FIELD'.  */
  	  error (0, 0, _("invalid field specifier: `%s'"), s);
  	}
-@@ -817,7 +1050,23 @@
+@@ -817,7 +1048,23 @@
  	  break;
  
  	case 't':
diff --git a/coreutils.spec b/coreutils.spec
index ae27b4e..89a2f58 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -4,7 +4,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.2.1
-Release: 21
+Release: 22
 License: GPL
 Group:   System Environment/Base
 Url:     ftp://alpha.gnu.org/gnu/coreutils/
@@ -244,6 +244,10 @@ fi
 %_sbindir/chroot
 
 %changelog
+* Mon Aug 16 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-22
+- Fixed sort -t LSB test failure (bug #121154).
+- Fixed join LSB test failure (bug #121153).
+
 * Wed Aug 11 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-21
 - Apply upstream patch to fix 'cp -a' onto multiply-linked files (bug #128874).
 - SELinux patch fix: don't error out if lgetfilecon() returns ENODATA.