--- vcl/source/glyphs/gcach_ftyp.cxx.old	2007-04-03 10:43:44.857291182 +0200
+++ vcl/source/glyphs/gcach_ftyp.cxx	2007-04-04 10:55:25.851189855 +0200
@@ -60,6 +60,8 @@
 #include FT_TRUETYPE_TABLES_H
 #include FT_TRUETYPE_TAGS_H
 #include FT_TRUETYPE_IDS_H
+#include <fontconfig/fontconfig.h>
+#include <fontconfig/fcfreetype.h>
 
 #ifndef FT_RENDER_MODE_MONO  // happens in the MACOSX build
     #define FT_RENDER_MODE_MONO ft_render_mode_mono
@@ -1199,6 +1201,10 @@
             // check if symbol aliasing helps
             if( (aChar <= 0x00FF) && mpFontInfo->IsSymbolFont() )
                 nGlyphIndex = FT_Get_Char_Index( maFaceFT, aChar | 0xF000 );
+
+	    // Finally try the postscript name table
+	    if (!nGlyphIndex)
+		nGlyphIndex = FcFreeTypeCharIndex( maFaceFT, aChar );
         }
         mpFontInfo->CacheGlyphIndex( aChar, nGlyphIndex );
     }
--- vcl/util/makefile.mk.old	2007-04-03 10:43:34.917141237 +0200
+++ vcl/util/makefile.mk	2007-04-04 10:56:10.381861590 +0200
@@ -183,7 +183,7 @@
 
 .IF "$(USE_BUILTIN_RASTERIZER)"!=""
     LIB1FILES +=    $(SLB)$/glyphs.lib
-    SHL1STDLIBS+=   $(FREETYPELIB)
+    SHL1STDLIBS+=   $(FREETYPELIB) -lfontconfig
 .ENDIF # USE_BUILTIN_RASTERIZER
 
 SHL1LIBS=   $(LIB1TARGET)
