--- a/symbian4/mw/btservices/package_definition_3.0.xml	Fri May 21 12:27:05 2010 +0100
+++ b/symbian4/mw/btservices/package_definition_3.0.xml	Mon May 24 19:00:53 2010 +0100
@@ -99,6 +99,10 @@
    <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
     <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
    </component>
+   <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
+    <unit bldFile="bluetoothengine/btserviceutil/group"/>
+   </component>
+
   </collection>
   <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
    <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">

--- a/symbian4/mw/homescreensrv/package_definition_3.0.xml	Fri May 21 12:27:05 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition_3.0.xml	Mon May 24 19:00:53 2010 +0100
@@ -110,7 +110,7 @@
   </collection>
     <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
      <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
-      <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
+      <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
      </component>
      <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
       <unit bldFile="group"/>

--- a/symbian4/mw/securitysrv/package_definition_3.0.xml	Fri May 21 12:27:05 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition_3.0.xml	Mon May 24 19:00:53 2010 +0100
@@ -134,8 +134,8 @@
    <component id="securitynotifier" filter="s60" name="Security Notifier">
     <unit bldFile="securitydialogs/securitynotifier/group"/>
    </component>
-   <component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
-    <unit bldFile="securitydialogs/lockclient/group"/>
+   <component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
+    <unit bldFile="securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
     <unit bldFile="securitydialogs/lockapp/group"/>