diff --git a/releng/org.eclipse.cdt.master/.project b/releng/org.eclipse.cdt.master/.project
new file mode 100644
index 00000000000..60a9cddcba9
--- /dev/null
+++ b/releng/org.eclipse.cdt.master/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.master</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.cdt.master/build.properties b/releng/org.eclipse.cdt.master/build.properties
new file mode 100644
index 00000000000..64f93a9f0b7
--- /dev/null
+++ b/releng/org.eclipse.cdt.master/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
new file mode 100644
index 00000000000..a9667dc1259
--- /dev/null
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.cdt.master"
+      label="CDT Master Feature"
+      version="4.0.0"
+      provider-name="Eclipse.org">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="org.eclipse.cdt"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.cdt.core.parser.c99.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"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.cdt.sdk"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.cdt.testing"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.cdt.xlc.feature"
+         version="0.0.0"/>
+
+</feature>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index e5bd700348e..6f5d5ced147 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -1,3 +1,6 @@
+! The master
+feature@org.eclipse.cdt.master=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/releng/org.eclipse.cdt.master
+
 ! Cross platform
 plugin@org.eclipse.cdt.core=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.core
 plugin@org.eclipse.cdt.ui=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/all/org.eclipse.cdt.ui
diff --git a/releng/org.eclipse.cdt.releng/master/build.properties b/releng/org.eclipse.cdt.releng/master/build.properties
index e5e47453c91..305a83fcea5 100644
--- a/releng/org.eclipse.cdt.releng/master/build.properties
+++ b/releng/org.eclipse.cdt.releng/master/build.properties
@@ -70,16 +70,7 @@ collBase=.
 # value is a '&' separated list of ',' separate triples.  For example, 
 #     configs=win32,win32,x86 & linux,motif,x86
 # By default the value is *,*,*
-configs=\
-      aix,motif,ppc \
-    & linux,gtk,x86 \
-    & linux,gtk,x86_64 \
-    & linux,gtk,ppc \
-    & linux,gtk,ia64 \
-    & macosx,carbon,ppc \
-    & qnx,photon,x86 \
-    & solaris,motif,sparc \
-    & win32,win32,x86
+#configs=
 
 outputUpdateJars=true
 groupConfigurations=true
diff --git a/releng/org.eclipse.cdt.releng/master/customTargets.xml b/releng/org.eclipse.cdt.releng/master/customTargets.xml
index 3fa71e20283..099bcbdad2c 100644
--- a/releng/org.eclipse.cdt.releng/master/customTargets.xml
+++ b/releng/org.eclipse.cdt.releng/master/customTargets.xml
@@ -7,27 +7,7 @@
 <target name="allElements">
 	<ant antfile="${genericTargets}" target="${target}">
 		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.cdt"/>
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.cdt.sdk"/>
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.cdt.debug.gdbjtag"/>
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.cdt.core.parser.c99.feature"/>
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.cdt.core.parser.upc.feature"/>
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.cdt.testing"/>
+		<property name="id" value="org.eclipse.cdt.master"/>
 	</ant>
 </target>
 
@@ -38,7 +18,7 @@
 <!-- Add one target for each root element and each configuration -->
 <!-- ===================================================================== -->
 
-<target name="assemble.org.eclipse.cdt.group.group.group">
+<target name="assemble.org.eclipse.cdt.master.group.group.group">
 	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
 		<property name="archiveName" value="cdt-master-${branchVersion}-${buildId}.zip"/>
 	</ant>