diff -r 29086410e6a3 -r 3d5b6dc0fe59 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Wed May 19 16:50:27 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Thu May 20 18:02:22 2010 +0100
@@ -7967,6 +7967,43 @@
 </component>
 </collection>
 </block>
+<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
+<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
+<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
+<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
+</component>
+</collection>
+<collection name="loudmouth" long-name="Loudmouth" level="prt">
+<!-- collection is really a component so it needs to be moved down a directory -->
+<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
+<unit bldFile="mw/opensrv/loudmouth/group"/>
+</component>
+</collection>
+<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
+<!-- collection is really a component so it needs to be moved down a directory -->
+<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
+<unit bldFile="mw/opensrv/libtelepathy/group"/>
+</component>
+</collection>
+<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
+<!-- collection is really a component so it needs to be moved down a directory -->
+<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
+<unit bldFile="mw/opensrv/telepathygabble/group"/>
+</component>
+</collection>
+<collection name="isolationserver" long-name="Isolation Server" level="server">
+<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
+<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
+</component>
+<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
+<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
+</component>
+<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
+<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
+<unit bldFile="mw/opensrv/isolationserver/group"/>
+</component>
+</collection>
+</block>
 </layer>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">