diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index cd51d7e3a0a..829559971e3 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -36,6 +36,10 @@
    <includes
          id="org.eclipse.cdt.core.lrparser.feature"
          version="0.0.0"/>
+         
+   <includes
+         id="org.eclipse.cdt.core.parser.upc.feature"
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.cdt.debug.gdbjtag"
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 9e2f7f42666..1247cfa3d13 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -59,6 +59,9 @@
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
 			<property name="builder" value="${basedir}/lrparser"/>
 		</ant>
+		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
+			<property name="builder" value="${basedir}/upc"/>
+		</ant>
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
 			<property name="builder" value="${basedir}/xlc"/>
 		</ant>
@@ -80,6 +83,9 @@
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
 			<property name="builder" value="${basedir}/lrparser"/>
 		</ant>
+		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
+			<property name="builder" value="${basedir}/upc"/>
+		</ant>
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
 			<property name="builder" value="${basedir}/xlc"/>
 		</ant>
@@ -378,6 +384,12 @@
 		<antcall target="tagone">
 			<param name="tagmodule" value="org.eclipse.cdt/lrparser/org.eclipse.cdt.core.lrparser.feature"/>
 		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/upc/org.eclipse.cdt.core.parser.upc"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/upc/org.eclipse.cdt.core.parser.upc.feature"/>
+		</antcall>
 		<antcall target="tagone">
 			<param name="tagmodule" value="org.eclipse.cdt/xlc/org.eclipse.cdt.managedbuilder.xlc.core"/>
 		</antcall>
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index 81c25bbf7af..45015f39531 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -37,6 +37,9 @@ the CDT Optional Features category.</li>
 <li>LR Parser - provides a parser for the ISO/IEC 9899:1999 variant of the C programming language (aka C99), generated from a 
 grammar using the LPG parser generator.  The grammar can be reused and extended to 
 create your own parser for variants on the C programming language.</li>
+<li>Unified Parallel C Support - Provides support for the Unified Parallel C programming langugage.  
+Provides parsing/indexing infrastructure and language definition, allowing the UPC language to be recognized by CDT.  
+Requires the LR parser feature.</li>
 <li>Mylyn Bridge - allows CDT to work with Mylyn.</li>
 <li>CDT Utilities - provides utilities for C/C++ Development Tools</li>
 <li>CDT Testing Feature - includes all test plugins required for running automated JUnit tests</li>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index 7973421ccdd..c795e991ec5 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -18,6 +18,9 @@
 	<feature id="org.eclipse.cdt.core.lrparser.feature" url="features/org.eclipse.cdt.core.lrparser.feature_@buildVersion@.jar" version="@buildVersion@">
 		<category name="CDT Optional Features"/>
 	</feature>
+	<feature id="org.eclipse.cdt.core.parser.upc.feature" url="features/org.eclipse.cdt.core.parser.upc.feature_@buildVersion@.jar" version="@buildVersion@">
+		<category name="CDT Optional Features"/>
+	</feature>
 	<feature id="org.eclipse.cdt.xlc.feature" url="features/org.eclipse.cdt.xlc.feature_@buildVersion@.jar" version="@buildVersion@">
 		<category name="CDT Optional Features"/>
 	</feature>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 61eb47bfb7f..eff9de1e57d 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -82,6 +82,10 @@ plugin@org.eclipse.cdt.core.lrparser=@cdtTag@,:pserver:anonymous@dev.eclipse.org
 plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20080326131619/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200803061910.jar
 feature@org.eclipse.cdt.core.lrparser.feature=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/lrparser/org.eclipse.cdt.core.lrparser.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.feature=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.core.parser.upc.feature
+
 ! CDT Utilities
 plugin@org.eclipse.cdt.util=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/util/org.eclipse.cdt.util
 feature@org.eclipse.cdt.util=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/util/org.eclipse.cdt.util-feature