diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index e89101aafc4..c08d7b28b4a 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -135,7 +135,7 @@
 			todir="${buildDirectory}/site/eclipse/plugins"/>
 		
 		<!-- 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" />
+		<!--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" /-->
 
 		<zip destfile="${zipsdir}/${masterFile}"
 			basedir="${buildDirectory}/site/eclipse"/>
diff --git a/releng/org.eclipse.cdt.releng/master/build.properties b/releng/org.eclipse.cdt.releng/master/build.properties
index 090b33d12b8..d28828e8503 100644
--- a/releng/org.eclipse.cdt.releng/master/build.properties
+++ b/releng/org.eclipse.cdt.releng/master/build.properties
@@ -18,6 +18,13 @@
 # Of course any of the settings here can be overridden by spec'ing 
 # 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
+
 ############# CVS CONTROL ################
 # The CVS tag to use when fetching the map files from the repository
 mapVersionTag=HEAD