diff -r 6ac358898135 -r 71db71bd8775 symbian4/single/sysdefs/auto/system_model.xml
--- a/symbian4/single/sysdefs/auto/system_model.xml	Fri Jul 16 16:36:18 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model.xml	Fri Jul 16 17:34:33 2010 +0100
@@ -3087,11 +3087,9 @@
 <unit bldFile="mw/securitysrv/securitydialogs/autolock/indicatorplugin" proFile="indicatorautolockplugin.pro" qmakeArgs="-r"/>
 </component>
 <component name="autolockuseractivityservice" long-name="Auto Lock User Activity Service" introduced="^4" filter="s60">
-<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
-<unit bldFile="mw/securitysrv/securitydialogs/autolock" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
+<unit bldFile="mw/securitysrv/securitydialogs/autolock/autolockuseractivityservice" proFile="autolockuseractivityservice.pro" qmakeArgs="-r"/>
 </component>
 <component name="autolocksrv" long-name="Auto Lock Server" introduced="^4" filter="s60">
-<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
 <unit bldFile="mw/securitysrv/securitydialogs/autolock" proFile="autolock.pro" qmakeArgs="-r"/>
 </component>
 </collection>