diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index 9991e02aead..f2086df31e5 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -105,4 +105,8 @@
          id="org.eclipse.cdt.debug.edc"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.bupc"
+         version="0.0.0"/>
+
 </feature>
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 0cfb5a0e42f..c54823b38cb 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -648,5 +648,11 @@
 		<antcall target="tagone">
 			<param name="tagmodule" value="org.eclipse.cdt/edc/org.eclipse.cdt.scripting"/>
 		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/upc/org.eclipse.cdt.managedbuilder.bupc.ui"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/upc/org.eclipse.cdt.bupc-feature"/>
+		</antcall>
 	</target>
 </project>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index f64c5bbbd9b..1c3023d7881 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -66,4 +66,7 @@
 	<feature id="org.eclipse.cdt.p2" url="features/org.eclipse.cdt.p2_1.0.0.@timeStamp@.jar" version="1.0.0.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
+	<feature id="org.eclipse.cdt.bupc" url="features/org.eclipse.cdt.bupc_1.0.2.@timeStamp@.jar" version="1.0.2.@timeStamp@">
+		<category name="CDT Optional Features"/>
+	</feature>
 </site>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index c014d4f920b..44bc40d94db 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -149,3 +149,7 @@ plugin@org.eclipse.tm.tcf.debug=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.e
 plugin@org.eclipse.tm.tcf.debug.ui=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=trunk,path=plugins/org.eclipse.tm.tcf.debug.ui
 plugin@org.eclipse.tm.tcf.rse=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=trunk,path=plugins/org.eclipse.tm.tcf.rse
 feature@org.eclipse.tm.tcf.feature=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf,tag=trunk,path=features/org.eclipse.tm.tcf.feature
+
+! Berkeley UPC
+plugin@org.eclipse.cdt.managedbuilder.bupc.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.managedbuilder.bupc.ui
+feature@org.eclipse.cdt.bupc=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.bupc-feature