--- a/fontsupport/fontutils/group/bld.inf	Tue Aug 31 16:13:36 2010 +0300
+++ b/fontsupport/fontutils/group/bld.inf	Wed Sep 01 12:19:53 2010 +0100
@@ -26,6 +26,15 @@
 
 PRJ_EXPORTS
 
+// Copy font rasterizer
+../iTypeRaster/winscw/ityperast.dll                 /epoc32/release/winscw/udeb/iTypeRast.dll
+../iTypeRaster/winscw/ityperast.dll                 /epoc32/release/winscw/urel/iTypeRast.dll
+../iTypeRaster/winscw/ityperast.RSC                 /epoc32/release/winscw/udeb/z/resource/plugins/iTypeRast.rsc
+../iTypeRaster/winscw/ityperast.RSC                 /epoc32/release/winscw/urel/z/resource/plugins/iTypeRast.rsc
+
+../iTypeRaster/armv5/ityperast.dll                  /epoc32/release/armv5/udeb/iTypeRast.dll
+../iTypeRaster/armv5/ityperast.dll                  /epoc32/release/armv5/urel/iTypeRast.dll
+../iTypeRaster/armv5/ityperast.RSC                  /epoc32/data/z/resource/plugins/iTypeRast.RSC
 
 // Select correct font source directory
 #ifndef RD_KANNADA_FONTS
@@ -90,47 +99,9 @@
 ../Vectorfonts/Series60Korean.ttf                        /epoc32/release/armv5/udeb/Series60Korean.ttf
 ../Vectorfonts/Series60Korean.ttf                        /epoc32/release/armv5/urel/Series60Korean.ttf
 
-// Export typeface xml files
-typefaces_s60_English.xml                    /epoc32/release/winscw/udeb/z/resource/Fonts/typefaces.xml
-typefaces_s60_English.xml                    /epoc32/release/winscw/urel/z/resource/Fonts/typefaces.xml
-
-typefaces_s60_English.xml                    /epoc32/release/winscw/udeb/z/resource/Fonts/typefaces_s60_English.xml
-typefaces_s60_English.xml                    /epoc32/release/winscw/urel/z/resource/Fonts/typefaces_s60_English.xml
-typefaces_s60_English.xml                    /epoc32/release/armv5/udeb/typefaces_s60_English.xml
-typefaces_s60_English.xml                    /epoc32/release/armv5/urel/typefaces_s60_English.xml
-
-typefaces_s60_Japanese.xml                    /epoc32/release/winscw/udeb/z/resource/Fonts/typefaces_s60_Japanese.xml
-typefaces_s60_Japanese.xml                    /epoc32/release/winscw/urel/z/resource/Fonts/typefaces_s60_Japanese.xml
-typefaces_s60_Japanese.xml                    /epoc32/release/armv5/udeb/typefaces_s60_Japanese.xml
-typefaces_s60_Japanese.xml                    /epoc32/release/armv5/urel/typefaces_s60_Japanese.xml
-
-typefaces_s60_Korean.xml                    /epoc32/release/winscw/udeb/z/resource/Fonts/typefaces_s60_Korean.xml
-typefaces_s60_Korean.xml                    /epoc32/release/winscw/urel/z/resource/Fonts/typefaces_s60_Korean.xml
-typefaces_s60_Korean.xml                    /epoc32/release/armv5/udeb/typefaces_s60_Korean.xml
-typefaces_s60_Korean.xml                    /epoc32/release/armv5/urel/typefaces_s60_Korean.xml
-
-typefaces_s60_Simplified_Chinese.xml                    /epoc32/release/winscw/udeb/z/resource/Fonts/typefaces_s60_Simplified_Chinese.xml
-typefaces_s60_Simplified_Chinese.xml                    /epoc32/release/winscw/urel/z/resource/Fonts/typefaces_s60_Simplified_Chinese.xml
-typefaces_s60_Simplified_Chinese.xml                    /epoc32/release/armv5/udeb/typefaces_s60_Simplified_Chinese.xml
-typefaces_s60_Simplified_Chinese.xml                    /epoc32/release/armv5/urel/typefaces_s60_Simplified_Chinese.xml
-
-typefaces_s60_Simplified_Traditional.xml                    /epoc32/release/winscw/udeb/z/resource/Fonts/typefaces_s60_Simplified_Traditional.xml
-typefaces_s60_Simplified_Traditional.xml                    /epoc32/release/winscw/urel/z/resource/Fonts/typefaces_s60_Simplified_Traditional.xml
-typefaces_s60_Simplified_Traditional.xml                    /epoc32/release/armv5/udeb/typefaces_s60_Simplified_Traditional.xml
-typefaces_s60_Simplified_Traditional.xml                    /epoc32/release/armv5/urel/typefaces_s60_Simplified_Traditional.xml
-
-typefaces_s60_Traditional_Chinese.xml                    /epoc32/release/winscw/udeb/z/resource/Fonts/typefaces_s60_Traditional_Chinese.xml
-typefaces_s60_Traditional_Chinese.xml                    /epoc32/release/winscw/urel/z/resource/Fonts/typefaces_s60_Traditional_Chinese.xml
-typefaces_s60_Traditional_Chinese.xml                    /epoc32/release/armv5/udeb/typefaces_s60_Traditional_Chinese.xml
-typefaces_s60_Traditional_Chinese.xml                    /epoc32/release/armv5/urel/typefaces_s60_Traditional_Chinese.xml
-		
-
-
 // Export IBY files
 ../rom/FontUtils.iby                              CORE_MW_LAYER_IBY_EXPORT_PATH(FontUtils.iby)
-#ifndef FF_PRODUCT_FONTS
 ../rom/fonts_variant.iby                          CUSTOMER_MW_LAYER_IBY_EXPORT_PATH(fonts_variant.iby)
-#endif
 
 ./removegtfiles.meta                             /epoc32/tools/makefile_templates/s60/removegtfiles.meta
 ./removegtfiles.flm                              /epoc32/tools/makefile_templates/s60/removegtfiles.flm