diff --git a/releng/org.eclipse.cdt.releng/.cvsignore b/releng/org.eclipse.cdt.releng/.cvsignore
index 2e9e5e7a6f7..86417542da4 100644
--- a/releng/org.eclipse.cdt.releng/.cvsignore
+++ b/releng/org.eclipse.cdt.releng/.cvsignore
@@ -7,3 +7,4 @@ compile.log
 mail.txt
 eclipse-SDK-new.zip
 message.txt
+index.html
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index e1c42ffbfc4..b9ddea508e1 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -32,6 +32,18 @@ integrations for build/debug, user documentation<br>
       </td>
       <td style="vertical-align: top;"><a
  href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip">org.eclipse.cdt-@branchVersion@-@buildId@-linux.x86.zip</a></td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Linux/ppc<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.zip">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ppc.zip</a></td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Linux/ia64<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.zip">org.eclipse.cdt-@branchVersion@-@buildId@-linux.ia64.zip</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">MacOSX/ppc<br>
@@ -87,6 +99,18 @@ integrations for build/debug, user documentation<br>
       </td>
       <td style="vertical-align: top;"><a
  href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.x86.zip</a></td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Linux/ppc<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ppc.zip</a></td>
+    </tr>
+    <tr>
+      <td style="vertical-align: top;">Linux/ia64<br>
+      </td>
+      <td style="vertical-align: top;"><a
+ href="org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.zip">org.eclipse.cdt.sdk-@branchVersion@-@buildId@-linux.ia64.zip</a></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">MacOSX/ppc<br>
diff --git a/releng/org.eclipse.cdt.releng/platform/build.properties b/releng/org.eclipse.cdt.releng/platform/build.properties
index 59eb35b9f48..e672b1893ee 100644
--- a/releng/org.eclipse.cdt.releng/platform/build.properties
+++ b/releng/org.eclipse.cdt.releng/platform/build.properties
@@ -60,13 +60,15 @@ collBase=.
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
-      aix,*,ppc \
-    & hpux,*,PA_RISC \
-    & linux,*,x86 \
-    & macosx,*,ppc \
-    & qnx,*,x86 \
-    & solaris,*,sparc \
-    & win32,*,x86
+      aix,motif,ppc \
+    & hpux,motif,PA_RISC \
+    & linux,gtk,x86 \
+    & linux,gtk,ppc \
+    & linux,gtk,ia64 \
+    & macosx,carbon,ppc \
+    & qnx,photon,x86 \
+    & solaris,motif,sparc \
+    & win32,win32,x86
 
 #Arguments to send to the zip executable
 zipargs=
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
index 3c04bfc27cf..3c9a3a9164c 100644
--- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -23,43 +23,55 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.aix.*.ppc">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.hpux.*.PA_RISC">
+<target name="assemble.org.eclipse.cdt.hpux.motif.PA_RISC">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-hpux.PA_RISC.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.linux.*.x86">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.macosx.*.ppc">
+<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.zip"/>
+	</ant>
+</target>
+
+<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.zip"/>
+	</ant>
+</target>
+
+<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.*.x86">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.solaris.*.sparc">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.win32.*.x86">
+<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 096390d9b58..26cc99ca71b 100644
--- a/releng/org.eclipse.cdt.releng/sdk/build.properties
+++ b/releng/org.eclipse.cdt.releng/sdk/build.properties
@@ -60,13 +60,15 @@ collBase=.
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
 configs=\
-      aix,*,ppc \
-    & hpux,*,PA_RISC \
-    & linux,*,x86 \
-    & macosx,*,ppc \
-    & qnx,*,x86 \
-    & solaris,*,sparc \
-    & win32,*,x86
+      aix,motif,ppc \
+    & hpux,motif,PA_RISC \
+    & linux,gtk,x86 \
+    & linux,gtk,ppc \
+    & linux,gtk,ia64 \
+    & macosx,carbon,ppc \
+    & qnx,photon,x86 \
+    & solaris,motif,sparc \
+    & win32,win32,x86
 
 #Arguments to send to the zip executable
 zipargs=
diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
index 5c1bd01519d..5238bca2868 100644
--- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
@@ -23,43 +23,55 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.sdk.aix.*.ppc">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.hpux.*.PA_RISC">
+<target name="assemble.org.eclipse.cdt.sdk.hpux.motif.PA_RISC">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-hpux.PA_RISC.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.linux.*.x86">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.macosx.*.ppc">
+<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.zip"/>
+	</ant>
+</target>
+
+<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.zip"/>
+	</ant>
+</target>
+
+<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.*.x86">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.solaris.*.sparc">
+<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.zip"/>
 	</ant>
 </target>
 
-<target name="assemble.org.eclipse.cdt.sdk.win32.*.x86">
+<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>