--- a/symbian4/mw/usbservices/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Tue Jun 29 12:34:13 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^4">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
    <block name="usbservices" level="generic" long-name="USB Services" levels="framework server generic specific plugin">
@@ -131,9 +131,6 @@
 </component>
 </collection>
 <collection name="usbuis" long-name="USB UIs" level="specific">
-<component name="usbui" filter="s60" long-name="USB UI">
-<unit bldFile="/sf/mw/usbservices/usbuis/usbui/group"/>
-</component>
 <component name="usbuinotif" filter="s60" long-name="USB UI Notifiers">
 <unit bldFile="/sf/mw/usbservices/usbuis/usbuinotif/group"/>
 </component>
@@ -143,8 +140,11 @@
 <component name="usbimageprintui" filter="s60" long-name="ImagePrint UI">
 <unit bldFile="/sf/mw/usbservices/usbuis/imageprintui/group"/>
 </component>
-<component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-<unit bldFile="/sf/mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
+<component name="usbsettingsapp" long-name="USB Settings Application" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/usbservices/usbuis/usbsettingsapp" proFile="usbsettingsapp.pro" qmakeArgs="-r"/>
+</component>
+<component name="usbindicatorplugin" long-name="USB Indicator Plugin" introduced="^4" filter="s60" plugin="Y">
+<unit bldFile="/sf/mw/usbservices/usbuis/usbindicatorplugin" proFile="usbindicatorplugin.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="usbservices_test" long-name="USB Services Test" level="server"/>