--- a/common/build.postbuild.xml	Fri May 07 10:14:46 2010 +0100
+++ b/common/build.postbuild.xml	Wed May 12 12:42:35 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="SF-POSTBUILD" xmlns:hlm="http://www.nokia.com/helium">
-    <target name="sf-postbuild">
+    <target name="sf-postbuild" depends="sf-build-roms">
         <stopwatch name="sf-postbuild"/>
         <echo>[SF-POSTBUILD]</echo>
         
@@ -898,4 +898,14 @@
         </copy>
     </target>
 
+    <target name="sf-build-roms">
+        <if>
+            <istrue value="${sf.spec.referenceroms.createimages.enable}" />
+            <then>
+                <echo message="INFO Building iMaker configurations"/>
+                <runtarget target="build-roms"/>
+            </then>
+        </if>    
+    </target>
+    
 </project>

--- a/common/tools/ats/ats_specialise_test_drop.pl	Fri May 07 10:14:46 2010 +0100
+++ b/common/tools/ats/ats_specialise_test_drop.pl	Wed May 12 12:42:35 2010 +0100
@@ -141,8 +141,8 @@
 $test_drop->{'test'}->{'buildid'}->[0] = $build_id, if $build_id;
 # Insert the path to the ROM image
 if ($image_path) {
-    $test_drop->{'test'}->{'plan'}->[0]->{'flash'}->[0];
-    my $flash_params = $test_drop->{'test'}->{'plan'}->[0]->{'flash'};
+	$test_drop->{'test'}->{'plan'}->[0]->{'flash'}->[0];
+	my $flash_params = $test_drop->{'test'}->{'plan'}->[0]->{'flash'};
     $flash_params->[0] = { 'target-alias' => $test_target, 'images' => $image_path };
 }