diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index e301e77e936..90f2499d06e 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -36,7 +36,7 @@
    <includes
          id="org.eclipse.cdt.core.lrparser.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.cdt.core.lrparser.sdk"
          version="0.0.0"/>
@@ -44,7 +44,7 @@
    <includes
          id="org.eclipse.cdt.core.parser.upc.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.cdt.core.parser.upc.sdk"
          version="0.0.0"/>
@@ -85,4 +85,8 @@
          id="org.eclipse.cdt.examples.dsf"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.debug.ui.memory"
+         version="0.0.0"/>
+
 </feature>
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index 52fcd915d3f..5b9782b56ca 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -86,6 +86,9 @@
 			<property name="builder" value="${basedir}/dsfgdb"/>
 		</ant>
 		-->
+		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
+			<property name="builder" value="${basedir}/memory"/>
+		</ant>
 		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
 			<property name="builder" value="${basedir}/platform"/>
 		</ant>
@@ -121,6 +124,9 @@
 			<property name="builder" value="${basedir}/dsfgdb"/>
 		</ant>
 		-->
+		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
+			<property name="builder" value="${basedir}/memory"/>
+		</ant>
 	</target>
 	
 	<target name="unzip" depends="init" unless="dontUnzip">
@@ -500,6 +506,18 @@
 		<antcall target="tagone">
 			<param name="tagmodule" value="org.eclipse.cdt/releng/org.eclipse.cdt.master"/>
 		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.traditional"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.transport"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.search"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory-feature"/>
+		</antcall>
 		<antcall target="tagone">
 			<param name="tagmodule" value="org.eclipse.cdt/dsf/org.eclipse.cdt.dsf"/>
 		</antcall>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index 4e575dcacd5..faecfcbcbfc 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -54,4 +54,7 @@
 	<feature id="org.eclipse.cdt.examples.dsf" url="features/org.eclipse.examples.dsf_5.1.0.@timeStamp@.jar" version="5.1.0.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
+	<feature id="org.eclipse.cdt.debug.ui.memory" url="features/org.eclipse.cdt.debug.ui.memory_1.2.0.@timeStamp@.jar" version="1.2.0.@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 6b25b41a57f..fd3b6a34cda 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -113,3 +113,9 @@ plugin@org.eclipse.cdt.dsf.gdb=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsr
 plugin@org.eclipse.cdt.dsf.gdb.ui=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui
 plugin@org.eclipse.cdt.tests.dsf.gdb=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb
 feature@org.eclipse.cdt.gnu.dsf=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature
+
+! CDT Memory
+plugin@org.eclipse.cdt.debug.ui.memory.traditional=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.traditional
+plugin@org.eclipse.cdt.debug.ui.memory.transport=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.transport
+plugin@org.eclipse.cdt.debug.ui.memory.search=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory.search
+feature@org.eclipse.cdt.debug.ui.memory=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/memory/org.eclipse.cdt.debug.ui.memory-feature
diff --git a/releng/org.eclipse.cdt.releng/memory/build.properties b/releng/org.eclipse.cdt.releng/memory/build.properties
new file mode 100644
index 00000000000..fc9b0984b74
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/memory/build.properties
@@ -0,0 +1,95 @@
+###############################################################################
+# Copyright (c) 2005, 2009 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.5
+
+# The version of the byte code targeted
+javacTarget=1.5
diff --git a/releng/org.eclipse.cdt.releng/memory/customTargets.xml b/releng/org.eclipse.cdt.releng/memory/customTargets.xml
new file mode 100644
index 00000000000..0d5f506c3c3
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/memory/customTargets.xml
@@ -0,0 +1,133 @@
+<project name="Build specific targets and properties" default="noDefault" >
+
+<property name="basews" value="gtk" />
+<property name="baseos" value="linux" />
+<property name="basearch" value="x86" />
+<property name="basenl" value="en_US" />
+
+<!-- ===================================================================== -->
+<!-- Run a given ${target} on all elements being built -->
+<!-- Add on <ant> task for each top level element being built. -->
+<!-- ===================================================================== -->
+<target name="allElements">
+	<ant antfile="${genericTargets}" target="${target}" >
+		<property name="type" value="feature" />
+		<property name="id" value="org.eclipse.cdt.debug.ui.memory" />
+	</ant>
+</target>
+
+<!-- ===================================================================== -->
+<!-- Targets to assemble the built elements for particular configurations  -->
+<!-- These generally call the generated assemble scripts (named in -->
+<!-- ${assembleScriptName}) but may also add pre and post processing -->
+<!-- Add one target for each root element and each configuration -->
+<!-- ===================================================================== -->
+
+<target name="assemble.org.eclipse.cdt.debug.ui.memory">
+	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+		<property name="archiveName" value="cdt-memory-${branchVersion}-${buildId}.zip"/>
+	</ant>
+</target>
+
+<!-- ===================================================================== -->
+<!-- Check out map files from correct repository -->
+<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+<!-- ===================================================================== -->
+<target name="getMapFiles">
+	<copy file="${builder}/../maps/cdt.map" todir="${buildDirectory}/maps"/>
+	<replace file="${buildDirectory}/maps/cdt.map">
+		<replacefilter token="@cdtTag@" value="${cdtTag}"/>
+	</replace>
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do before setup -->
+<!-- ===================================================================== -->
+<target name="preSetup">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do after setup but before starting the build proper -->
+<!-- ===================================================================== -->
+<target name="postSetup">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do before fetching the build elements -->
+<!-- ===================================================================== -->
+<target name="preFetch">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do after fetching the build elements -->
+<!-- ===================================================================== -->
+<target name="postFetch">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do before generating the build scripts. -->
+<!-- ===================================================================== -->
+<target name="preGenerate">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do after generating the build scripts. -->
+<!-- ===================================================================== -->
+<target name="postGenerate">
+</target>
+
+
+<!-- ===================================================================== -->
+<!-- Steps to do before running the build.xmls for the elements being built. -->
+<!-- ===================================================================== -->
+<target name="preProcess">
+	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
+		<include name="**/about.mappings" />
+	</replace>
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do after running the build.xmls for the elements being built. -->
+<!-- ===================================================================== -->
+<target name="postProcess">
+</target>
+
+
+<!-- ===================================================================== -->
+<!-- Steps to do before running assemble. -->
+<!-- ===================================================================== -->
+<target name="preAssemble">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do after  running assemble. -->
+<!-- ===================================================================== -->
+<target name="postAssemble">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do after the build is done. -->
+<!-- ===================================================================== -->
+<target name="postBuild">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do to test the build results -->
+<!-- ===================================================================== -->
+<target name="test">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Steps to do to publish the build results -->
+<!-- ===================================================================== -->
+<target name="publish">
+</target>
+
+<!-- ===================================================================== -->
+<!-- Default target                                                        -->
+<!-- ===================================================================== -->
+<target name="noDefault">
+	<echo message="You must specify a target when invoking this file" />
+</target>
+
+</project>