--- a/symbian4/mw/accesssec/package_definition.xml	Sat Jun 26 14:31:58 2010 +0100
+++ b/symbian4/mw/accesssec/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="accesssec" level="generic" long-name="Access Security" levels="plugin framework server generic specific">
@@ -62,9 +62,12 @@
 <unit bldFile="/sf/mw/accesssec/accesssec_plat/eap_type_api/group"/>
 </component>
 </collection>
-<collection name="securitysettings" long-name="Security Settings" level="generic">
-<component name="securitysettings_build" long-name="Security Settings Build" introduced="^4">
-<unit bldFile="/sf/mw/accesssec/securitysettings" qmakeArgs="-r" proFile="securitysettings.pro"/>
+<collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
+<component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
+<unit bldFile="/sf/mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4">
+<unit bldFile="/sf/mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">