--- a/symbian3/split/sysdefs/system_model_os.xml	Fri Oct 09 12:12:50 2009 +0100
+++ b/symbian3/split/sysdefs/system_model_os.xml	Fri Oct 09 15:18:59 2009 +0100
@@ -128,9 +128,6 @@
 <component name="f32test" long-name="File Server Tests" purpose="development">
 <unit bldFile="os\kernelhwsrv\kerneltest\f32test\group" mrp="os\kernelhwsrv\kerneltest\f32test\group\base_f32test.mrp"/>
 </component>
-<component name="syborg" long-name="Syborg" purpose="development">
-<unit bldFile="os\QEMU\baseport\syborg" mrp=""/>
-</component>
 </collection>
 <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">
@@ -2262,6 +2259,15 @@
 </collection>
 </block>
 </layer>
+<layer name="adaptation" long-name="Adaptation" levels="hw-if">
+<block name="syborg_adaptation" level="hw-if" long-name="Syborg Adaptation" levels="hw-if">
+<collection id="baseport" name="Baseport" level="hw-if"> 
+<component id="syborg" name="Syborg" introduced="symbian^2" purpose="optional">
+<unit bldFile="adaptation\QEMU\baseport\syborg" mrp="baseport/syborg/syborg.mrp"/>
+</component>
+</collection>
+</block>
+</layer>
 </systemModel>
 <SystemBuild schema="1.0.0">
   <option name="KEEPGOING" abldOption="-keepgoing" description="Causes make to keepgoing on errors" enable="Y"/>