diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 9ed8e94559a..c83e4c197e3 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -50,6 +50,15 @@
+
+
+
+
+
+
+
+
+
@@ -59,6 +68,15 @@
+
+
+
+
+
+
+
+
+
@@ -78,6 +96,15 @@
+
+
+
+
+
+
+
+
+
@@ -328,5 +355,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.releng/c99/build.properties b/releng/org.eclipse.cdt.releng/c99/build.properties
new file mode 100644
index 00000000000..e01f24b529f
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/c99/build.properties
@@ -0,0 +1,95 @@
+###############################################################################
+# Copyright (c) 2005, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# Markus Schorn (Wind River Systems)
+###############################################################################
+#####################
+# Parameters describing how and where to execute the build.
+# Typical users need only update the following properties:
+# baseLocation - where things you are building against are installed
+# bootclasspath - The base jars to compile against (typicaly rt.jar)
+# configs - the list of {os, ws, arch} configurations to build.
+#
+# Of course any of the settings here can be overridden by spec'ing
+# them on the command line (e.g., -DbaseLocation=d:/eclipse
+
+############# CVS CONTROL ################
+# The CVS tag to use when fetching the map files from the repository
+mapVersionTag=HEAD
+
+# The CVS tag to use when fetching elements to build. By default the
+# builder will use whatever is in the maps. Use this value to override
+# for example, when doing a nightly build out of HEAD
+# fetchTag=HEAD
+
+cdtTag=HEAD
+
+############## BUILD / GENERATION CONTROL ################
+# The directory into which the build elements will be fetched and where
+# the build will take place. buildDirectory and install should be the same
+# value.
+buildDirectory=build
+
+# Type of build. Used in naming the build output. Typically this value is
+# one of I, N, M, S, ...
+buildType=I
+
+# ID of the build. Used in naming the build output.
+buildId=TestBuild
+
+# Label for the build. Used in naming the build output
+buildLabel=${buildType}.${buildId}
+
+# Timestamp for the build. Used in naming the build output
+timestamp=007
+
+# Base location for anything the build needs to compile against. For example,
+# when building GEF, the baseLocation should be the location of a previously
+# installed Eclipse against which the GEF code will be compiled.
+baseLocation=
+
+#Os/Ws/Arch/nl of the eclipse specified by baseLocation
+#baseos
+#basews
+#basearch
+#basenl
+
+# The location underwhich all of the build output will be collected. This will be
+# the root path in the resultant zip file.
+collPlace=eclipse
+
+# The directory in which to execute zip of the ${collPlace} directory
+collBase=.
+
+# The list of {os, ws, arch} configurations to build. This
+# value is a '&' separated list of ',' separate triples. For example,
+# configs=win32,win32,x86 & linux,motif,x86
+# By default the value is *,*,*
+configs=*,*,*
+
+archivesFormat=*,*,*-zip
+
+#Arguments to send to the zip executable
+zipargs=
+
+############# JAVA COMPILER OPTIONS ##############
+# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
+#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
+
+# Whether or not to include debug info in the output jars
+javacDebugInfo=on
+
+# Whether or not to fail the build if there are compiler errors
+javacfailonerror=true
+
+# The version of the source code
+javacSource=1.4
+
+# The version of the byte code targeted
+javacTarget=1.4
diff --git a/releng/org.eclipse.cdt.releng/c99/customTargets.xml b/releng/org.eclipse.cdt.releng/c99/customTargets.xml
new file mode 100644
index 00000000000..debb542d690
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/c99/customTargets.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index af684306f01..3b30322f3c6 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -62,3 +62,17 @@ plugin@org.eclipse.cdt.debug.gdbjtag=@cdtTag@,:pserver:anonymous@dev.eclipse.org
plugin@org.eclipse.cdt.debug.gdbjtag.core=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/jtag/org.eclipse.cdt.debug.gdbjtag.core
plugin@org.eclipse.cdt.debug.gdbjtag.ui=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/jtag/org.eclipse.cdt.debug.gdbjtag.ui
feature@org.eclipse.cdt.debug.gdbjtag=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/jtag/org.eclipse.cdt.debug.gdbjtag-feature
+
+! XL compiler integration
+plugin@org.eclipse.cdt.errorparsers.xlc=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/xlc/org.eclipse.cdt.errorparsers.xlc
+plugin@org.eclipse.cdt.managedbuilder.xlc.ui=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/xlc/org.eclipse.cdt.managedbuilder.xlc.ui
+feature@org.eclipse.cdt.xlc=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/xlc/org.eclipse.cdt.xlc.feature
+
+! C99 parser
+plugin@org.eclipse.cdt.core.parser.c99=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/c99/org.eclipse.cdt.core.parser.c99
+plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S200704252129/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200702061926.jar
+feature@org.eclipse.cdt.core.parser.c99=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/c99/org.eclipse.cdt.core.parser.c99.feature
+
+! UPC parser - also uses LPG but since we already download it above no need to download again
+plugin@org.eclipse.cdt.core.parser.upc=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.core.parser.upc
+feature@org.eclipse.cdt.core.parser.upc=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.core.parser.upc.feature
\ No newline at end of file
diff --git a/releng/org.eclipse.cdt.releng/upc/build.properties b/releng/org.eclipse.cdt.releng/upc/build.properties
new file mode 100644
index 00000000000..e01f24b529f
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/upc/build.properties
@@ -0,0 +1,95 @@
+###############################################################################
+# Copyright (c) 2005, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+# Markus Schorn (Wind River Systems)
+###############################################################################
+#####################
+# Parameters describing how and where to execute the build.
+# Typical users need only update the following properties:
+# baseLocation - where things you are building against are installed
+# bootclasspath - The base jars to compile against (typicaly rt.jar)
+# configs - the list of {os, ws, arch} configurations to build.
+#
+# Of course any of the settings here can be overridden by spec'ing
+# them on the command line (e.g., -DbaseLocation=d:/eclipse
+
+############# CVS CONTROL ################
+# The CVS tag to use when fetching the map files from the repository
+mapVersionTag=HEAD
+
+# The CVS tag to use when fetching elements to build. By default the
+# builder will use whatever is in the maps. Use this value to override
+# for example, when doing a nightly build out of HEAD
+# fetchTag=HEAD
+
+cdtTag=HEAD
+
+############## BUILD / GENERATION CONTROL ################
+# The directory into which the build elements will be fetched and where
+# the build will take place. buildDirectory and install should be the same
+# value.
+buildDirectory=build
+
+# Type of build. Used in naming the build output. Typically this value is
+# one of I, N, M, S, ...
+buildType=I
+
+# ID of the build. Used in naming the build output.
+buildId=TestBuild
+
+# Label for the build. Used in naming the build output
+buildLabel=${buildType}.${buildId}
+
+# Timestamp for the build. Used in naming the build output
+timestamp=007
+
+# Base location for anything the build needs to compile against. For example,
+# when building GEF, the baseLocation should be the location of a previously
+# installed Eclipse against which the GEF code will be compiled.
+baseLocation=
+
+#Os/Ws/Arch/nl of the eclipse specified by baseLocation
+#baseos
+#basews
+#basearch
+#basenl
+
+# The location underwhich all of the build output will be collected. This will be
+# the root path in the resultant zip file.
+collPlace=eclipse
+
+# The directory in which to execute zip of the ${collPlace} directory
+collBase=.
+
+# The list of {os, ws, arch} configurations to build. This
+# value is a '&' separated list of ',' separate triples. For example,
+# configs=win32,win32,x86 & linux,motif,x86
+# By default the value is *,*,*
+configs=*,*,*
+
+archivesFormat=*,*,*-zip
+
+#Arguments to send to the zip executable
+zipargs=
+
+############# JAVA COMPILER OPTIONS ##############
+# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
+#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
+
+# Whether or not to include debug info in the output jars
+javacDebugInfo=on
+
+# Whether or not to fail the build if there are compiler errors
+javacfailonerror=true
+
+# The version of the source code
+javacSource=1.4
+
+# The version of the byte code targeted
+javacTarget=1.4
diff --git a/releng/org.eclipse.cdt.releng/upc/customTargets.xml b/releng/org.eclipse.cdt.releng/upc/customTargets.xml
new file mode 100644
index 00000000000..7472ac2e59a
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/upc/customTargets.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xlc/org.eclipse.cdt.xlc.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
index b2770987464..5f95a437f8c 100644
--- a/xlc/org.eclipse.cdt.xlc.feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.feature/feature.xml
@@ -2,7 +2,7 @@
@@ -19,7 +19,7 @@
-
+
@@ -27,6 +27,7 @@
+
+
+