--- a/symbian3/mw/uiresources/package_definition.xml	Mon Mar 01 11:41:17 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition.xml	Mon Mar 01 11:46:46 2010 +0000
@@ -161,10 +161,13 @@
             <unit bldFile="/sf/mw/uiresources/fontsupport/fontprovider/group"/>
           </component>
 <!-- R&D materials, should be Nokia only
-          <component name="fontutils" filter="s60" long-name="Font Utils">
+          <component name="s60_fonts" filter="s60" long-name="S60 Fonts">
             <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/group"/>
           </component>
 -->
+          <component name="fontutils" filter="sf_build" long-name="Font Utils">
+            <unit bldFile="/sf/mw/uiresources/fontsupport/fontutils/FontUtils/group"/>
+          </component>
         </collection>
         <collection name="helpthemes" long-name="Help Themes" level="data">
           <!-- collection is really a component. Need to move down a directory -->

--- a/symbian3/mw/uiresources/package_definition_3.0.xml	Mon Mar 01 11:41:17 2010 +0000
+++ b/symbian3/mw/uiresources/package_definition_3.0.xml	Mon Mar 01 11:46:46 2010 +0000
@@ -84,11 +84,14 @@
       <component id="fontprovider" filter="s60" name="Font Provider">
         <unit bldFile="fontsupport/fontprovider/group"/>
       </component>
-<!-- R&D materials, should be Nokia only
-      <component id="fontutils" filter="s60" name="Font Utils">
+<!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
+      <component id="s6_fonts" filter="s60" name="S60 Fonts">
         <unit bldFile="fontsupport/fontutils/group"/>
       </component>
 -->
+      <component id="fontutils" filter="sf_build" name="Font Utils">
+        <unit bldFile="fontsupport/fontutils/FontUtils/group"/>
+      </component>
     </collection>
     <collection id="helpthemes" name="Help Themes" level="data">
     	<!-- collection is really a component. Need to move down a directory -->