--- a/symbian4/app/messaging/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Tue Jun 01 17:27:50 2010 +0100
@@ -74,7 +74,7 @@
 <component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
 <component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
 <component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="/sf/app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">

--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Tue Jun 01 17:27:50 2010 +0100
@@ -92,11 +92,16 @@
 <!-- will should give the id/path something more unique than cenrep -->
 <unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
 </component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
+<!-- comment out until rom configs are added -->
+<!-- component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
 </component>
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
-<unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+</component -->
+<component name="sbs" filter="sf_build" long-name="Foundation SBS config" purpose="development" class="config">
+<!-- will should give the id/path something more unique than sbs -->
+<unit bldFile="/sf/os/deviceplatformrelease/foundation_system/sf_config/sbs/group"/>
 </component>
 </collection>
 <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">