diff --git a/ChangeLog b/ChangeLog
index d224df52b..a0a937108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-11  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSStringDrawing.m: drawRun() use GSFromUnicode() API for
+	conversion.
+
 Fri May 10 11:24:38 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* Source/NSRulerView.m ([NSRulerView -dealloc]): Do not release the 
diff --git a/Source/NSStringDrawing.m b/Source/NSStringDrawing.m
index 1b598b6af..6acebaa6a 100644
--- a/Source/NSStringDrawing.m
+++ b/Source/NSStringDrawing.m
@@ -248,7 +248,11 @@ drawRun(GSTextRun *run, NSPoint origin, GSDrawInfo *draw)
 	  if ((enc != NSASCIIStringEncoding) && 
 	      (enc != NSUnicodeStringEncoding))
 	    {
-	      buf[0] = encode_unitochar(run->glyphs[i].glyph, enc);
+	      unsigned int  size = 1;
+	      unsigned char c = 0;
+	      unsigned char *dst = buf;
+
+	      GSFromUnicode(&dst, &size, &(run->glyphs[i].glyph), 1, enc, 0, 0);
 	    }
 	  else
 	    {