diff --git a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
index 409711c..19aad1f 100644
--- a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
@@ -12,7 +12,7 @@
         on your operating system are not, e.g. it will be ${env.Path}
         not ${env.PATH} on Windows
     -->
-    <property 
+    <property
         environment="env"/>
     <!--
         Let users override standard properties, if desired. If
@@ -72,71 +72,54 @@
         value="${buildDirectory}/tmpsite-${archiveName}-temp"/>
     <target
         name="conditionAndSignJars"
-        depends="init">
-    	<!--
-    	if="doSign">
-       -->
-    	<!-- 
-    	
-    	get zip for signing
-              exclude content* artifacts*
-              add pack.properties
-              send to eclipse and wait
-    	       write over p2.build.repo, 
-    	       but update content and artifacts files
-    	       remove temp file
-    	-->
-    	
-    	<zip
-    		destfile="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip">
-    		
-    	            <zipfileset
-    	                dir="${buildDirectory}/${buildLabel}/${component}/repository"
-    	                excludes="content.xml,content.jar,artifacts.xml,artifacts.jar"/>
-    		     
-       </zip>
-    	
-    	 <updatePackProperties
-    	            archiveFilename="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>
-    	
-    	<!-- comment out when debugging, for original zip files, before updatePackProperties ran -->
-    	<delete file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip.bak"/>
-    		     	     	
+        depends="init"
+        if="doSign">
+        <!--
+            get zip for signing exclude content* artifacts* add
+            pack.properties send to eclipse and wait write over
+            p2.build.repo, but update content and artifacts files remove
+            temp file
+        -->
+        <zip
+            destfile="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip">
+            <zipfileset
+                dir="${p2.build.repo}"
+                excludes="content.xml,content.jar,artifacts.xml,artifacts.jar"/>
+        </zip>
+        <updatePackProperties
+            archiveFilename="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>
+        <!--
+            comment out when debugging, for original zip files, before
+            updatePackProperties ran
+       
+        <delete
+            file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip.bak"/>
+             -->
         <!--
             ==================================================================================
-             sign the jars in archive file
+            sign the jars in archive file
             ==================================================================================
         -->
-        	<!--
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/signjars.xml" >
-    	
-    	    <property name="archiveName" value="temp-${buildLabel}-${component}.zip"/>
-    	</ant>
--->
-       <!-- remove our temp zip file, once tested, debugged -->
-    	
-    	<!--
-            ==================================================================================
-             for modularity, pack200 is done here, optionally. The
-            resulting gz files are produced in update site directory.
-            This is optional since processing is expensive to do for
-            every build. Only need when ready to declare an update site,
-            and, for exmaple, no need to do for "local" or HEAD builds
-            since developers wouldn't normally need it for a quick check
-            of a build.
-            ==================================================================================
-        -->
-        <echo
-            level="info"
-            message="create pack files if desired ..."/>
-        <antcall
-            target="createPackFilesIfDesired"/>
-        <echo
-            level="info"
-            message="created pack files: ${packJarFiles}"/>
+       <!-- 
+    	<ant
+            antfile="${wtp.builder.home}/scripts/build/signjars.xml">
+            <property
+                name="archiveName"
+                value="temp-${buildLabel}-${component}.zip"/>
+        </ant>
+    	-->
+        <unzip
+            dest="${p2.build.repo}"
+            file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>
 
-   
+
+        <!-- TODO we could add 'pack' to this task, if desierd -->
+        <p2.process.artifacts
+            repositoryPath="${p2.build.repo}"/>
+        <!--
+            remove our temp zip file, once tested, debugged <delete
+            file="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"/>
+        -->
     </target>
     <!--
         ==============================================================================================
@@ -244,7 +227,6 @@
         <echo
             message="doP2Repo: ${doP2Repo}"/>
     </target>
-
     <target
         name="normalizeJarFiles"
         if="doNormalize"
@@ -288,10 +270,9 @@
         if="doPack"
         depends="init">
         <!--
-            stick with JAVA5 for signing/packing for now ... 
-            there are 'compatibility' issues with JAVA6?
+            stick with JAVA5 for signing/packing for now ... there are
+            'compatibility' issues with JAVA6?
         -->
-      
         <java
             jar="${pde.builder.path}/plugins/org.eclipse.equinox.launcher.jar"
             fork="true"
@@ -308,9 +289,8 @@
             <arg
                 line="-jarProcessor  ${verboseIfDebug} -outputDir ${buildDirectory}/${buildLabel}/${component}/repository -pack ${buildDirectory}/${buildLabel}/${component}/repository"/>
         </java>
-	
-	<!-- TODO: need to udpate meta data! -->
-	
+
+        <!-- TODO: need to udpate meta data! -->
     </target>
     <!--
         always make copy, since normally either normalized, or signed
@@ -380,9 +360,6 @@
         <echo
             message="doSign: ${doSign}"/>
     </target>
-
-
-
     <target
         name="createTraditionalZipFiles"
         depends="init">