diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 5d55c4dc001..a55ce829aec 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -152,157 +152,4 @@
 		</mail>
 	</target>
 
-	<target name="allElements">
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.debug.core"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.debug.mi.core"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.debug.mi.ui"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.debug.ui"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.launch"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.make.core"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.make.ui"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.managedbuilder.core"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.managedbuilder.ui"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.ui"/>
- 		</antcall>
-		<antcall target="${target}">
- 			<param name="type" value="feature"/>
- 			<param name="dir" value="features"/>
- 			<param name="id" value="org.eclipse.cdt"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="feature"/>
- 			<param name="dir" value="features"/>
- 			<param name="id" value="org.eclipse.cdt.sdk"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.sdk"/>
- 		</antcall>
-		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.aix"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.linux"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.qnx"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.solaris"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.core.win32"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.doc.user"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="feature"/>
- 			<param name="dir" value="features"/>
- 			<param name="id" value="org.eclipse.cdt.source"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="plugin"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source"/>
- 		</antcall>
-  		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source.aix.motif.ppc"/>
- 		</antcall>
- 		<!--antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source.dschaefer2hpux.motif.PA_RISC"/>
- 		</antcall-->
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source.linux.gtk.x86"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source.linux.motif.x86"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source.qnx.photon.x86"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source.solaris.motif.sparc"/>
- 		</antcall>
- 		<antcall target="${target}">
- 			<param name="type" value="fragment"/>
- 			<param name="dir" value="plugins"/>
- 			<param name="id" value="org.eclipse.cdt.source.win32.win32.x86"/>
- 		</antcall>
-  	</target>
-
 </project>
diff --git a/releng/org.eclipse.cdt.releng/platform/customTargets.xml b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
index 8db7f349f18..86fbbbc5a52 100644
--- a/releng/org.eclipse.cdt.releng/platform/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/platform/customTargets.xml
@@ -24,18 +24,18 @@
 	</ant>
 </target>
 
-<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.tar.gz"/>
-	</ant>
-</target>
-
 <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">
+	<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">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>
diff --git a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
index e9e7547d6d9..c5296616804 100644
--- a/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/sdk/customTargets.xml
@@ -29,18 +29,18 @@
 	</ant>
 </target>
 
-<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.tar.gz"/>
-	</ant>
-</target>
-
 <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">
+	<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">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="org.eclipse.cdt.sdk-${branchVersion}-${buildId}-linux.ppc.tar.gz"/>