--- a/symbian3/mw/imsrv/package_definition.xml	Tue Jun 01 17:27:00 2010 +0100
+++ b/symbian3/mw/imsrv/package_definition.xml	Tue Jun 01 17:27:34 2010 +0100
@@ -50,7 +50,7 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="imsrv" level="specific" long-name="Instant Messaging and Presence Services" levels="plugin framework server generic specific">
@@ -130,7 +130,7 @@
 <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
 <unit bldFile="/sf/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component name="presence_avabilitytext" long-name="Presence Avability Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availbility Text" filter="s60" class="api">
 <unit bldFile="/sf/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -153,9 +153,6 @@
 <component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
 <unit bldFile="/sf/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
 </component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="/sf/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
 <component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
 <unit bldFile="/sf/mw/imsrv/imservices/instantmessagingcache/group"/>
 </component>