diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 71fafdd4e80..975332a8e2a 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -175,6 +175,7 @@
 	</target>
 	
 	<!--pack200-->
+	<!-- this will pack the master zip using pack200 and generate p2 metadata based on the packed master zip-->
 	<target name="pack" depends="init" unless="hasErrors">
     	<echo message="Pack200" />
     	<property name="launcher" value="${basedir}/tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"/>
@@ -184,33 +185,44 @@
         	<arg line="-verbose"/>
         	<arg line="-processAll"/>
         	<arg line="-pack"/>
-        	<arg line="-outputDir ${zipsdir} ${zipsdir}/${masterFile}"/>
+        	<arg line="-outputDir ${zipsdir}/pack ${zipsdir}/${masterFile}"/>
         </java>
+		
+		<antcall target="generate.p2.metadata">
+			<param name="p2dir" value="${zipsdir}/pack/p2"/>
+			<param name="destination" value="${zipsdir}/pack/${masterFile}"/>
+		</antcall>
 	</target>
 	
 	<target name="generate.p2.metadata" depends="init" unless="hasErrors">
 		<!-- unzip the signed master site -->
-		<unzip src="${zipsdir}/${masterFile}" dest="${zipsdir}/p2"/>
+		<property name="p2dir" value="${zipsdir}/p2"/>
+		<property name="destination" value="${zipsdir}/${masterFile}"/>
+		
+		<unzip src="${destination}" dest="${p2dir}"/>
 		
 		<!-- generate p2 metadata -->
-		<antcall target="p2.metadata.generator" />
+		<antcall target="p2.metadata.generator">
+			<param name="p2site" value="${p2dir}"/>
+		</antcall>
 		
 		<!-- zip everything back up -->
-		<zip destfile="${zipsdir}/${masterFile}"
-			basedir="${zipsdir}/p2"/>
-		<delete dir="${zipsdir}/p2"/>
+		<zip destfile="${destination}"
+			basedir="${p2dir}"/>
+		<delete dir="${p2dir}"/>
 	</target>
 	
     <target name="p2.metadata.generator">
     	<echo message="Generate p2 Metadata" />
+    	<property name="p2site" value="${zipsdir}/p2"/>
     	<property name="launcher" value="${basedir}/tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"/>
         <java jar="${launcher}" fork="true" timeout="10800000" jvm="${jvm1.5}" failonerror="true" maxmemory="768m" error="${zipsdir}/p2errorlog.txt" dir="${buildDirectory}/eclipse" output="${zipsdir}/p2metadata.txt">
             <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
-            <arg line="-updateSite ${zipsdir}/p2"/>
-        	<arg line="-site file:${zipsdir}/p2/site.xml"/>
-        	<arg line="-metadataRepository file:${zipsdir}/p2"/>
+            <arg line="-updateSite ${p2site}"/>
+        	<arg line="-site file:${p2site}/site.xml"/>
+        	<arg line="-metadataRepository file:${p2site}"/>
         	<arg line="-metadataRepositoryName CDT Update Site"/>
-        	<arg line="-artifactRepository file:${zipsdir}/p2"/>
+        	<arg line="-artifactRepository file:${p2site}"/>
         	<arg line="-artifactRepositoryName CDT Artifacts"/>
         	<arg line="-compress"/>
         	<arg line="-reusePack200Files"/>