--- a/symbian3/single/job_props.ant.xml	Wed Jun 23 12:55:05 2010 +0100
+++ b/symbian3/single/job_props.ant.xml	Wed Jun 23 17:41:29 2010 +0100
@@ -33,7 +33,7 @@
     <!-- and set sf.spec.baseline.enable to 'true'                                                          -->        
 
     <!-- get full source env and binaries from pdk -->
-    <property name="sf.spec.baseline.location"       value="\\v800008\PDT\prebuilt_default.22_custom" /> <!-- prebuilt stuff etc. -->
+    <property name="sf.spec.baseline.location"       value="\\v800008\PDT\prebuilt_default.40" /> <!-- prebuilt stuff etc. -->
     <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}_custom" /> <!-- tools baseline location e.g. tools_epoc.zip -->
     
     <!-- platform build specific properties -->

--- a/symbian3/single/sources_3.0.0.csv	Wed Jun 23 12:55:05 2010 +0100
+++ b/symbian3/single/sources_3.0.0.csv	Wed Jun 23 17:41:29 2010 +0100
@@ -1,10 +1,4 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,changeset,2b41c6133edf,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/ibm/,/rnd/rndonly/ibm,changeset,04ac8a231adf,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,a94919327585,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
-//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,changeset,bc65ca6d8d9c,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,changeset,3308607f8c27,
 http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,bb16bb5b2818,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
@@ -101,7 +95,7 @@
 http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,06f00a153f2a,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,664a5fed40c6,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,9644881fedd0,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,d0917ab8b45e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,f81fa44d2763,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,5ced40f3c181,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,0709f76d91e5,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,e5ca06a707ac,layers.sysdef.xml

--- a/symbian3/single/sysdefs/system_model.xml	Wed Jun 23 12:55:05 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Wed Jun 23 17:41:29 2010 +0100
@@ -2667,6 +2667,9 @@
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
 </component>
+<component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
+<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
+</component>
 </collection>
 <!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
 <collection name="s60bld" long-name="S60 Build">