diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 95b0577005b..41db582581c 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -223,7 +223,7 @@
 		<delete dir="${p2dir}"/>
 	</target>
 	
-    <target name="p2.metadata.generator">
+    <target name="p2.metadata.generator_old">
     	<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"/>
@@ -241,6 +241,21 @@
         	<arg line="-vmargs -Xmx256M"/>
         </java>
 	</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" failonerror="true" maxmemory="768m" dir="${buildDirectory}/eclipse">
+            <arg line="-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher" />
+        	<arg line="-metadataRepository file:${p2site}"/>
+        	<arg line="-artifactRepository file:${p2site}"/>
+            <arg line="-source ${p2site}"/>
+        	<arg line="-compress"/>
+            <arg line="-publishArtifacts"/>
+        	<arg line="-reusePack200Files"/>
+        </java>
+	</target>
 
 	<target name="test" depends="init" unless="hasErrors">
 		<record name="${testReports}/testsLog.txt" action="start" loglevel="verbose"/>