diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index c08d7b28b4a..a9a39dc60f3 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -136,10 +136,28 @@
 		
 		<!-- generate p2 metadata -->
 		<!--p2.generator updateSite="${buildDirectory}/site/eclipse" metadataRepository="file:${buildDirectory}/site/eclipse" artifactRepository="file:${buildDirectory}/site/eclipse" metadataRepositoryName="CDT Update Site" artifactRepositoryName="CDT Artifacts" publishArtifacts="true" compress="true" append="true" /-->
-
+		<antcall target="generate.p2.metadata" />
+		
 		<zip destfile="${zipsdir}/${masterFile}"
 			basedir="${buildDirectory}/site/eclipse"/>
 	</target>
+	
+    <target name="generate.p2.metadata">
+    	<echo message="Generate Metadata" />
+        <java jar="${buildDirectory}/eclipse/plugins/org.eclipse.equinox.launcher.jar" fork="true" timeout="10800000" jvm="/opt/public/common/ibm-java2-ppc-50/bin/java" failonerror="true" maxmemory="768m" error="${zipsdir}/errorlog.txt" dir="${buildDirectory}/eclipse" output="${zipsdir}/p2metadata.txt">
+            <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
+            <arg line="-updateSite ${buildDirectory}/site/eclipse"/>
+        	<arg line="-site file:${buildDirectory}/site/eclipse/site.xml"/>
+        	<arg line="-metadataRepository file:${buildDirectory}/site/eclipse"/>
+        	<arg line="-metadataRepositoryName CDT Update Site"/>
+        	<arg line="-artifactRepository file:${buildDirectory}/site/eclipse"/>
+        	<arg line="-artifactRepositoryName CDT Artifacts"/>
+        	<arg line="-compress"/>
+        	<arg line="-reusePack200Files"/>
+        	<arg line="-noDefaultIUs"/>
+        	<arg line="-vmargs -Xmx256M"/>
+        </java>
+	</target>
 
 	<target name="test" depends="init" unless="hasErrors">
 		<record name="${testReports}/testsLog.txt" action="start" loglevel="verbose"/>
diff --git a/releng/org.eclipse.cdt.releng/master/build.properties b/releng/org.eclipse.cdt.releng/master/build.properties
index d28828e8503..db0a7fd5cd7 100644
--- a/releng/org.eclipse.cdt.releng/master/build.properties
+++ b/releng/org.eclipse.cdt.releng/master/build.properties
@@ -19,11 +19,11 @@
 # them on the command line (e.g., -DbaseLocation=d:/eclipse
 
 ############# PRODUCT/PACKAGING CONTROL #############
-generate.p2.metadata = true
-p2.metadata.repo=file:${buildDirectory}/site/eclipse
-p2.artifact.repo=file:${buildDirectory}/site/eclipse
-p2.flavor=tooling
-p2.publish.artifacts=true
+#generate.p2.metadata = true
+#p2.metadata.repo=file:${buildDirectory}/site/eclipse
+#p2.artifact.repo=file:${buildDirectory}/site/eclipse
+#p2.flavor=tooling
+#p2.publish.artifacts=true
 
 ############# CVS CONTROL ################
 # The CVS tag to use when fetching the map files from the repository