diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
index 230c4ff26f4..2ecaed593ce 100755
--- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
+++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
@@ -55,15 +55,16 @@ if [ `basename $SITE` = testUpdates ]; then
     fi
     rm index.html site.xml web/site.xsl
     cvs -q update -dPR
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/testUpdates,g' \
-    	-e 's,Project Update,Project Test Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/testUpdates,g' \
+    	-e 's,Project 2.0 Update,Project Test Update,g' \
     	index.html > index.html.new
     mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/testUpdates,g' \
-        -e 's,Project Update,Project Test Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/testUpdates,g' \
+        -e 's,Project 2.0 Update,Project Test Update,g' \
+    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_patches -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Test Update,g' \
+    sed -e 's,Project 2.0 Update,Project Test Update,g' \
     	web/site.xsl > web/site.xsl.new
     mv -f web/site.xsl.new web/site.xsl
     echo "Conditioning the site... $SITE"
@@ -174,15 +175,16 @@ elif [ `basename $SITE` = signedUpdates ]; then
     fi
     rm index.html site.xml web/site.xsl
     cvs -q update -dPR
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/signedUpdates,g' \
-    	-e 's,Project Update,Project Signed Test Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/signedUpdates,g' \
+    	-e 's,Project 2.0 Update,Project Signed Test Update,g' \
     	index.html > index.html.new
     mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/signedUpdates,g' \
-        -e 's,Project Update,Project Signed Test Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/signedUpdates,g' \
+        -e 's,Project 2.0 Update,Project Signed Test Update,g' \
+    	-e '/<!-- BEGIN_2_0 -->/,/<!-- END_2_0_patches -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Signed Test Update,g' \
+    sed -e 's,Project 2.0 Update,Project Signed Test Update,g' \
     	web/site.xsl > web/site.xsl.new
     mv -f web/site.xsl.new web/site.xsl
 elif [ `basename $SITE` = milestones ]; then
@@ -191,18 +193,19 @@ elif [ `basename $SITE` = milestones ]; then
     stamp=`date +'%Y%m%d-%H%M'`
     rm index.html site.xml web/site.xsl
     cvs -q update -dPR
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/updates/milestones,g' \
-    	-e 's,Project Update,Project Milestone Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/updates/milestones,g' \
+    	-e 's,Project 2.0 Update,Project Milestone Update,g' \
     	-e '\,</h1>,a\
 This site contains Target Management Milestones (I-, S- and M- builds) which are \
 being contributed to the Europa coordinated release train (Eclipse 3.3).' \
     	index.html > index.html.new
     mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/updates/milestones,g' \
-        -e 's,Project Update,Project Milestone Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/updates/milestones,g' \
+        -e 's,Project 2.0 Update,Project Milestone Update,g' \
+    	-e '<!-- BEGIN_2_0_1 -->,/<!-- END_2_0_1 -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Milestone Update,g' \
+    sed -e 's,Project 2.0 Update,Project Milestone Update,g' \
     	web/site.xsl > web/site.xsl.new
     mv -f web/site.xsl.new web/site.xsl
 elif [ `basename $SITE` = interim ]; then
@@ -211,18 +214,19 @@ elif [ `basename $SITE` = interim ]; then
     stamp=`date +'%Y%m%d-%H%M'`
     rm index.html site.xml web/site.xsl
     cvs -q update -dPR
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/updates/interim,g' \
-    	-e 's,Project Update,Project Interim Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/updates/interim,g' \
+    	-e 's,Project 2.0 Update,Project Interim Update,g' \
     	-e '\,</h1>,a\
 This site contains Target Management Interim Maintenance builds (M-builds) in order \
 to test them before going live.' \
     	index.html > index.html.new
     mv -f index.html.new index.html
-    sed -e 's,/dsdp/tm/updates,/dsdp/tm/updates/interim,g' \
-        -e 's,Project Update,Project Interim Update,g' \
+    sed -e 's,/dsdp/tm/updates/2.0,/dsdp/tm/updates/interim,g' \
+        -e 's,Project 2.0 Update,Project Interim Update,g' \
+    	-e '<!-- BEGIN_2_0_1 -->,/<!-- END_2_0_1 -->/d' \
         site.xml > site.xml.new
     mv -f site.xml.new site.xml
-    sed -e 's,Project Update,Project Interim Update,g' \
+    sed -e 's,Project 2.0 Update,Project Interim Update,g' \
     	web/site.xsl > web/site.xsl.new
     mv -f web/site.xsl.new web/site.xsl
 else
@@ -231,6 +235,9 @@ else
     stamp=`date +'%Y%m%d-%H%M'`
     rm index.html site.xml web/site.xsl
     cvs -q update -dPR
+    sed -e '<!-- BEGIN_2_0_1 -->,/<!-- END_2_0_1 -->/d' \
+        site.xml > site.xml.new
+    mv -f site.xml.new site.xml
 fi
 FEATURES=`grep 'features/[^ ]*\.qualifier\.jar' site.xml | sed -e 's,^[^"]*"features/\([^0-9]*[0-9][0-9.]*\).*$,\1,g'`
 for feature in $FEATURES ; do
diff --git a/releng/org.eclipse.rse.updatesite/index.html b/releng/org.eclipse.rse.updatesite/index.html
index 93218c8eab9..975b3672ee3 100644
--- a/releng/org.eclipse.rse.updatesite/index.html
+++ b/releng/org.eclipse.rse.updatesite/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Target Management Project Updates</title>
+<title>Target Management Project 2.0 Updates</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style>@import url("web/site.css");</style>
 <script type="text/javascript">
@@ -60,7 +60,7 @@
       </a>
     </div>
 
-	<h1 class="title">Target Management Project Updates</h1>
+	<h1 class="title">Target Management Project 2.0 Updates</h1>
 	<h2>Just getting started?</h2>
       <p><b>See <a href="http://www.eclipse.org/dsdp/tm/tutorial/">http://www.eclipse.org/dsdp/tm/tutorial/</a></b></p>
     <hr/>
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 2271446cedd..fda2847210f 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -1,60 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site pack200="true" 
-	mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/updates/site.xml&amp;format=xml&amp;protocol=http"
-	digestURL="http://download.eclipse.org/dsdp/tm/updates/">
-<!-- was disabled due to bug 163406 digestURL="http://download.eclipse.org/dsdp/tm/updates/" -->
-   <description url="http://download.eclipse.org/dsdp/tm/updates/">
-      This is the Target Management Project Update Site.
+	mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/updates/2.0/site.xml&amp;format=xml&amp;protocol=http"
+	digestURL="http://download.eclipse.org/dsdp/tm/updates/2.0/">
+<!-- was disabled due to bug 163406 digestURL="http://download.eclipse.org/dsdp/tm/updates/2.0/" -->
+   <description url="http://download.eclipse.org/dsdp/tm/updates/2.0/">
+      This is the Target Management Project 2.0 Update Site.
    </description>
-   <feature url="features/org.eclipse.rse.core_2.0.0.qualifier.jar" id="org.eclipse.rse.core" version="2.0.0.qualifier">
-      <category name="RSE End-User Runtime"/>
+<!-- BEGIN_2_0 -->
+   <feature url="features/org.eclipse.rse.core_2.0.0.v20070609-7P--EB7sQRxRjbc.jar" id="org.eclipse.rse.core" version="2.0.0.v20070609-7P--EB7sQRxRjbc">
+      <category name="TM/RSE 2.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.dstore_2.0.0.qualifier.jar" id="org.eclipse.rse.dstore" version="2.0.0.qualifier">
-      <category name="RSE End-User Runtime"/>
+   <feature url="features/org.eclipse.rse.dstore_2.0.0.v20070609-7F--DUUEF6Ez0L1.jar" id="org.eclipse.rse.dstore" version="2.0.0.v20070609-7F--DUUEF6Ez0L1">
+      <category name="TM/RSE 2.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.ftp_2.0.0.qualifier.jar" id="org.eclipse.rse.ftp" version="2.0.0.qualifier">
-      <category name="RSE End-User Runtime"/>
+   <feature url="features/org.eclipse.rse.ftp_2.0.0.v20070609-77378_kE77Y7U9K5G7A.jar" id="org.eclipse.rse.ftp" version="2.0.0.v20070609-77378_kE77Y7U9K5G7A">
+      <category name="TM/RSE 2.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.local_2.0.0.qualifier.jar" id="org.eclipse.rse.local" version="2.0.0.qualifier">
-      <category name="RSE End-User Runtime"/>
+   <feature url="features/org.eclipse.rse.local_2.0.0.v20070609-7_--AgI99h9c9c.jar" id="org.eclipse.rse.local" version="2.0.0.v20070609-7_--AgI99h9c9c">
+      <category name="TM/RSE 2.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse_2.0.0.qualifier.jar" id="org.eclipse.rse" version="2.0.0.qualifier">
-      <category name="RSE End-User Runtime"/>
+   <feature url="features/org.eclipse.rse_2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB.jar" id="org.eclipse.rse" version="2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB">
+      <category name="TM/RSE 2.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.sdk_2.0.0.qualifier.jar" id="org.eclipse.rse.sdk" version="2.0.0.qualifier">
-      <category name="Remote System Explorer (RSE) Extender SDK"/>
+   <feature url="features/org.eclipse.rse.sdk_2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq.jar" id="org.eclipse.rse.sdk" version="2.0.0.v20070609-7J--E7ZoHIP4RfkXykCt2OjoBujq">
+      <category name="TM/RSE 2.0"/>
    </feature>
-   <feature url="features/org.eclipse.rse.ssh_2.0.0.qualifier.jar" id="org.eclipse.rse.ssh" version="2.0.0.qualifier">
-      <category name="RSE End-User Runtime"/>
+   <feature url="features/org.eclipse.rse.ssh_2.0.0.v20070609-78--_kE77Y7U7U.jar" id="org.eclipse.rse.ssh" version="2.0.0.v20070609-78--_kE77Y7U7U">
+      <category name="TM/RSE 2.0"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.telnet_2.0.0.v20070609-6378AgI99h9cEU5G7A.jar" id="org.eclipse.rse.telnet" version="2.0.0.v20070609-6378AgI99h9cEU5G7A">
+      <category name="TM/RSE 2.0"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.examples_2.0.0.v20070609-6--9oA55P5M7Q.jar" id="org.eclipse.rse.examples" version="2.0.0.v20070609-6--9oA55P5M7Q">
+      <category name="TM/RSE 2.0"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.remotecdt_2.0.0.v20070609-4--8s733G3E3G.jar" id="org.eclipse.rse.remotecdt" version="2.0.0.v20070609-4--8s733G3E3G">
+      <category name="TM/RSE 2.0"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.discovery_2.0.0.v20070611-7J--E8McIJNJCPr.jar" id="org.eclipse.tm.discovery" version="2.0.0.v20070611-7J--E8McIJNJCPr">
+      <category name="TM/RSE 2.0"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.v20070609-7_--AvNDwNXrOcIwMflhNDDmDhHa">
+      <category name="TM/RSE 2.0"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.tests_2.0.0.v20070609-6--9oA55P5M7J.jar" id="org.eclipse.rse.tests" version="2.0.0.v20070609-6--9oA55P5M7J">
+      <category name="TM/RSE 2.0"/>
+   </feature>
+   <category-def name="TM/RSE 2.0" label="TM/RSE 2.0">
+      <description>
+         Features and add-ons of the 2.0 release of Target Management / RSE.
+      </description>
+   </category-def>
+<!-- END_2_0 -->
+<!-- BEGIN_2_0_patches -->
+   <feature url="features/org.eclipse.rse.ftp.2.0.0.patch_2.0.1.200707021623.jar" id="org.eclipse.rse.ftp.2.0.0.patch" version="2.0.1.200707021623" patch="true">
+      <category name="TM/RSE 2.0 patches"/>
+   </feature>
+   <category-def name="TM/RSE 2.0 patches" label="TM/RSE 2.0 patches">
+      <description>
+         Patches for features and add-ons of the 2.0 release of Target Management / RSE.
+      </description>
+   </category-def>
+<!-- END_2_0_patches -->
+<!-- BEGIN_2_0_1 -->
+   <feature url="features/org.eclipse.rse.core_2.0.1.qualifier.jar" id="org.eclipse.rse.core" version="2.0.1.qualifier">
+      <category name="TM/RSE 2.0.1"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.dstore_2.0.1.qualifier.jar" id="org.eclipse.rse.dstore" version="2.0.1.qualifier">
+      <category name="TM/RSE 2.0.1"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.ftp_2.0.1.qualifier.jar" id="org.eclipse.rse.ftp" version="2.0.1.qualifier">
+      <category name="TM/RSE 2.0.1"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.local_2.0.1.qualifier.jar" id="org.eclipse.rse.local" version="2.0.1.qualifier">
+      <category name="TM/RSE 2.0.1"/>
+   </feature>
+   <feature url="features/org.eclipse.rse_2.0.1.qualifier.jar" id="org.eclipse.rse" version="2.0.0.v20070609-7D--8mJIOQ6RwTkIMtp8OQKB">
+      <category name="TM/RSE 2.0.1"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.sdk_2.0.1.qualifier.jar" id="org.eclipse.rse.sdk" version="2.0.1.qualifier">
+      <category name="TM/RSE 2.0.1"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.ssh_2.0.1.qualifier.jar" id="org.eclipse.rse.ssh" version="2.0.1.qualifier">
+      <category name="TM/RSE 2.0.1"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.telnet_2.0.1.qualifier.jar" id="org.eclipse.rse.telnet" version="2.0.1.qualifier">
+      <category name="TM/RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_2.0.0.qualifier.jar" id="org.eclipse.rse.examples" version="2.0.0.qualifier">
-      <category name="Remote System Explorer (RSE) Extender SDK"/>
+      <category name="TM/RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.remotecdt_2.0.0.qualifier.jar" id="org.eclipse.rse.remotecdt" version="2.0.0.qualifier">
-      <category name="Target Management Add-ons and Stand-alone Offerings"/>
+      <category name="TM/RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.tm.discovery_2.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="2.0.0.qualifier">
-      <category name="Target Management Add-ons and Stand-alone Offerings"/>
+      <category name="TM/RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk_1.0.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="1.0.0.qualifier">
-      <category name="Target Management Add-ons and Stand-alone Offerings"/>
+      <category name="TM/RSE 2.0.1"/>
    </feature>
    <feature url="features/org.eclipse.rse.tests_2.0.0.qualifier.jar" id="org.eclipse.rse.tests" version="2.0.0.qualifier">
-      <category name="Remote System Explorer (RSE) Extender SDK"/>
+      <category name="TM/RSE 2.0.1"/>
    </feature>
-   <category-def name="RSE End-User Runtime" label="RSE End-User Runtime">
+   <category-def name="TM/RSE 2.0.1" label="TM/RSE 2.0.1">
       <description>
-         RSE Runtime-only features: no developer documentation or sources.
-      </description>
-   </category-def>
-   <category-def name="Remote System Explorer (RSE) Extender SDK" label="Remote System Explorer (RSE) Extender SDK">
-      <description>
-         Remote System Explorer (RSE) with developer documentation and sources.
-      </description>
-   </category-def>
-   <category-def name="Target Management Add-ons and Stand-alone Offerings" label="Target Management Add-ons and Stand-alone Offerings">
-      <description>
-         Target Management Core Components as well as Experimental add-ons for RSE.
+         Features and add-ons of the 2.0.1 release of Target Management / RSE.
       </description>
    </category-def>
+<!-- END_2_0_1 -->
 </site>
diff --git a/releng/org.eclipse.rse.updatesite/web/site.xsl b/releng/org.eclipse.rse.updatesite/web/site.xsl
index 6d0e36e80f4..070c3540e8b 100644
--- a/releng/org.eclipse.rse.updatesite/web/site.xsl
+++ b/releng/org.eclipse.rse.updatesite/web/site.xsl
@@ -5,7 +5,7 @@
 <xsl:for-each select="site">
 	<html>
 	<head>
-	<title>Target Management Project Updates</title>
+	<title>Target Management Project 2.0 Updates</title>
 	<style>@import url("web/site.css");</style>
 	</head>
 	<body>