--- a/symbian4/mw/appsupport/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/appsupport/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="appsupport" level="generic" long-name="Generic Application Support" levels="system plugin framework server generic specific">
@@ -161,16 +161,11 @@
 </component>
 </collection>
 <collection name="contextframework" long-name="Context Framework" level="framework">
-<!-- the units that are commented out need to be put back when configuration is in place.
-		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
 <component name="cfw" filter="s60" long-name="Context Framework">
-<!--<unit bldFile="contextframework/cfw/group"/> -->
+<unit bldFile="/sf/mw/appsupport/contextframework/cfw/group"/>
 </component>
 <component name="cfwplugins" filter="s60" long-name="Context Framework Plugins" plugin="Y">
-<!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-</component>
-<component name="contextframework_build" filter="s60" long-name="Context Framework Build">
-<unit bldFile="/sf/mw/appsupport/contextframework/group"/>
+<unit bldFile="/sf/mw/appsupport/contextframework/cfwplugins/group"/>
 </component>
 </collection>
 <collection name="coreapplicationuis" long-name="Core Application UIs" level="server">