--- a/package_definition.xml	Wed Apr 28 08:52:24 2010 +0300
+++ b/package_definition.xml	Sun May 02 21:30:11 2010 +0300
@@ -5,7 +5,12 @@
       <component id="bteng" filter="s60" name="Bluetooth Engine">
         <unit bldFile="bluetoothengine/bteng/group"/>
       </component>
+      <component id="btserviceutil" filter="s60" name="Bluetooth Service Utility">
+        <unit bldFile="bluetoothengine/btserviceutil/group"/>
+      </component>
       <component id="btnotif" filter="s60" name="Bluetooth Notifier">
+      	<!-- client is separated for breaking cyclic compiling dependencies -->
+        <unit bldFile="bluetoothengine/btnotif/btnotifclient/group"/>
         <unit bldFile="bluetoothengine/btnotif/group"/>
           <!-- is this test needed as unit? -->
         <!-- <unit bldFile="bluetoothengine/btnotif/tsrc/btnotifapitest/group"/> -->