--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Thu May 06 15:30:45 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Thu May 06 15:36:49 2010 +0100
@@ -121,6 +121,14 @@
 <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
 <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
 </component>
+<component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
 </collection>
 <collection id="driversupport" name="Generic Driver Support" level="hw-if">
 <component id="mediadrivers" name="Media Drivers" purpose="optional">

--- a/symbian3/single/sysdefs/sf3.svg	Thu May 06 15:30:45 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Thu May 06 15:36:49 2010 +0100
@@ -493,8 +493,8 @@
        </g>
       </g>
       <g id="ldds" transform="translate(17.7 37.6)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">Logical Dev­ice Drivers</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">Logical Dev­ice Drivers</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="ethernetldd" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -546,6 +546,16 @@
          <use width="9.3" height="9.3" x="83.69999999999999" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">USB Client Drivers</text>
         </g>
+        <g id="usbdescriptors" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">USB Descriptors</text>
+        </g>
+        <g id="usbdi_utils" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">USB DI Utils</text>
+        </g>
        </g>
       </g>
       <g id="driversupport" transform="translate(65.4 56.400000000000006)" class="collection">
@@ -20069,7 +20079,7 @@
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <tspan dy="-1em" x="265.17499999999995">109 Packages</tspan>
      <tspan dy="1em" x="265.17499999999995">661 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2902 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">2904 Components</tspan>
     </text>
    </g>
   </g>

--- a/symbian3/single/sysdefs/system_model.xml	Thu May 06 15:30:45 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Thu May 06 15:36:49 2010 +0100
@@ -195,6 +195,14 @@
 <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
 <unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
 </component>
+<component name="usbdescriptors" long-name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component name="usbdi_utils" long-name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
 </collection>
 <collection name="driversupport" long-name="Generic Driver Support" level="hw-if">
 <component name="mediadrivers" long-name="Media Drivers" purpose="optional">

--- a/symbian3/single/sysdefs/system_model_3.0.xml	Thu May 06 15:30:45 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Thu May 06 15:36:49 2010 +0100
@@ -121,6 +121,14 @@
 <!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
 <unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbc" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbc/base_e32_drivers_usbcli.mrp"/>
 </component>
+<component id="usbdescriptors" name="USB Descriptors" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdescriptors/base_drivers_usbdescriptors.mrp"/>
+</component>
+<component id="usbdi_utils" name="USB DI Utils" purpose="optional">
+<!-- owned and maintained by usb package. To be moved there as soon as technical limitations are resolved -->
+<unit bldFile="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils" mrp="/os/kernelhwsrv/kernel/eka/drivers/usbho/usbdi_utils/base_drivers_usbdi_utils.mrp"/>
+</component>
 </collection>
 <collection id="driversupport" name="Generic Driver Support" level="hw-if">
 <component id="mediadrivers" name="Media Drivers" purpose="optional">