diff --git a/releng/org.eclipse.cdt.releng/platform/build.properties b/releng/org.eclipse.cdt.releng/platform/build.properties
index 6e987229cc9..b521cbbcfea 100644
--- a/releng/org.eclipse.cdt.releng/platform/build.properties
+++ b/releng/org.eclipse.cdt.releng/platform/build.properties
@@ -60,6 +60,17 @@ collBase=.
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
+      aix,motif,ppc \
+    & linux,gtk,x86 \
+    & linux,gtk,x86_64 \
+    & linux,gtk,ppc \
+    & linux,gtk,ia64 \
+    & macosx,carbon,ppc \
+    & qnx,photon,x86 \
+    & solaris,motif,sparc \
+    & win32,win32,x86
+
+archivesFormat=\
       aix,motif,ppc-tar \
     & linux,gtk,x86-tar \
     & linux,gtk,x86_64-tar \
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
index 0e93408bba5..86fbbbc5a52 100644
--- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -18,55 +18,55 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.aix.motif.ppc-tar">
+<target name="assemble.org.eclipse.cdt.aix.motif.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.linux.gtk.x86-tar">
+<target name="assemble.org.eclipse.cdt.linux.gtk.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.linux.gtk.x86_64-tar">
+<target name="assemble.org.eclipse.cdt.linux.gtk.x86_64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.linux.gtk.ppc-tar">
+<target name="assemble.org.eclipse.cdt.linux.gtk.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.linux.gtk.ia64-tar">
+<target name="assemble.org.eclipse.cdt.linux.gtk.ia64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.macosx.carbon.ppc-tar">
+<target name="assemble.org.eclipse.cdt.macosx.carbon.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.qnx.photon.x86-tar">
+<target name="assemble.org.eclipse.cdt.qnx.photon.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.solaris.motif.sparc-tar">
+<target name="assemble.org.eclipse.cdt.solaris.motif.sparc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.win32.win32.x86-zip">
+<target name="assemble.org.eclipse.cdt.win32.win32.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-win32.x86.zip"/>
 	</ant>
diff --git a/releng/org.eclipse.cdt.releng/sdk/build.properties b/releng/org.eclipse.cdt.releng/sdk/build.properties
index 38f50a9cd7a..76c3684cc7e 100644
--- a/releng/org.eclipse.cdt.releng/sdk/build.properties
+++ b/releng/org.eclipse.cdt.releng/sdk/build.properties
@@ -60,6 +60,17 @@ collBase=.
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
+      aix,motif,ppc\
+    & linux,gtk,x86 \
+    & linux,gtk,x86_64 \
+    & linux,gtk,ppc \
+    & linux,gtk,ia64 \
+    & macosx,carbon,ppc \
+    & qnx,photon,x86 \
+    & solaris,motif,sparc \
+    & win32,win32,x86
+
+archivesFormat=\
       aix,motif,ppc-tar \
     & linux,gtk,x86-tar \
     & linux,gtk,x86_64-tar \
diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
index f55374683b3..c5296616804 100644
--- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
@@ -23,55 +23,55 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc-tar">
+<target name="assemble.org.eclipse.cdt.sdk.aix.motif.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-aix.ppc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86-tar">
+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86_64-tar">
+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.x86_64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.x86_64.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc-tar">
+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64-tar">
+<target name="assemble.org.eclipse.cdt.sdk.linux.gtk.ia64">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ia64.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.macosx.carbon.ppc-tar">
+<target name="assemble.org.eclipse.cdt.sdk.macosx.carbon.ppc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-macosx.ppc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86-tar">
+<target name="assemble.org.eclipse.cdt.sdk.qnx.photon.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-qnx.x86.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc-tar">
+<target name="assemble.org.eclipse.cdt.sdk.solaris.motif.sparc">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-solaris.sparc.tar.gz"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.win32.win32.x86-zip">
+<target name="assemble.org.eclipse.cdt.sdk.win32.win32.x86">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-win32.x86.zip"/>
 	</ant>
diff --git a/releng/org.eclipse.cdt.releng/testing/build.properties b/releng/org.eclipse.cdt.releng/testing/build.properties
index 3d5e81269e0..ae01f248cb3 100644
--- a/releng/org.eclipse.cdt.releng/testing/build.properties
+++ b/releng/org.eclipse.cdt.releng/testing/build.properties
@@ -59,7 +59,9 @@ collBase=.
 # value is a '&' separated list of ',' separate triples.  For example, 
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
-configs=*,*,*-zip
+configs=*,*,*
+
+archivesFormat=*,*,*-zip
 
 #Arguments to send to the zip executable
 zipargs=
diff --git a/releng/org.eclipse.cdt.releng/testing/customTargets.xml b/releng/org.eclipse.cdt.releng/testing/customTargets.xml
index bc816d8ebb0..860da4cb236 100644
--- a/releng/org.eclipse.cdt.releng/testing/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/testing/customTargets.xml
@@ -23,7 +23,7 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.testing.*.*.*-zip">
+<target name="assemble.org.eclipse.cdt.testing.*.*.*">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.testing-${branchVersion}-${buildId}.zip"/>
 	</ant>