diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index f3619918637..ee7975eced0 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -9,6 +9,11 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.sdk" />
 		</ant>
+		<!--
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.apache.commons_net" />
+		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.core" />
@@ -29,6 +34,11 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.dstore" />
 		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.remotecdt" />
+		</ant>
+		-->
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.examples" />
@@ -37,10 +47,6 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.efs" />
 		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.remotecdt" />
-		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.tm.discovery" />
@@ -282,7 +288,7 @@
 	<target name="postBuild" depends="myInit">
 		<mkdir dir="${packageDirectory}/${dropDir}" />
 		<move todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${buildDirectory}/${buildLabel}" includes="RSE-*.zip"/>
+			<fileset dir="${buildDirectory}/${buildLabel}" includes="RSE-*.zip,TM-*.zip"/>
 		</move>
 		<move todir="${packageDirectory}/${dropDir}">
 			<fileset dir="${buildDirectory}/${buildLabel}" includes="rseserver-*"/>
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 72a8564a870..6ec0572138c 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -5,27 +5,36 @@
       This is the Target Management Project Update Site for the Remote Systems Explorer (RSE).
    </description>
    <feature url="features/org.eclipse.rse.core_1.0.0.qualifier.jar" id="org.eclipse.rse.core" version="1.0.0.qualifier">
-      <category name="Remote System Explorer (Runtime Only)"/>
+      <category name="RSE Runtime only"/>
    </feature>
    <feature url="features/org.eclipse.rse.dstore_1.0.0.qualifier.jar" id="org.eclipse.rse.dstore" version="1.0.0.qualifier">
-      <category name="Remote System Explorer (Runtime Only)"/>
+      <category name="RSE Runtime only"/>
    </feature>
    <feature url="features/org.eclipse.rse.ftp_1.0.0.qualifier.jar" id="org.eclipse.rse.ftp" version="1.0.0.qualifier">
-      <category name="Remote System Explorer (Runtime Only)"/>
+      <category name="RSE Runtime only"/>
    </feature>
    <feature url="features/org.eclipse.rse.local_1.0.0.qualifier.jar" id="org.eclipse.rse.local" version="1.0.0.qualifier">
-      <category name="Remote System Explorer (Runtime Only)"/>
+      <category name="RSE Runtime only"/>
    </feature>
    <feature url="features/org.eclipse.rse.sdk_1.0.0.qualifier.jar" id="org.eclipse.rse.sdk" version="1.0.0.qualifier">
       <category name="Remote System Explorer (RSE)"/>
    </feature>
    <feature url="features/org.eclipse.rse.ssh_1.0.0.qualifier.jar" id="org.eclipse.rse.ssh" version="1.0.0.qualifier">
-      <category name="Remote System Explorer (Runtime Only)"/>
+      <category name="RSE Runtime only"/>
    </feature>
    <feature url="features/org.eclipse.rse.examples_1.0.0.qualifier.jar" id="org.eclipse.rse.examples" version="1.0.0.qualifier">
       <category name="Remote System Explorer (RSE)"/>
    </feature>
-   <category-def name="Remote System Explorer (Runtime Only)" label="RSE_Runtime">
+   <feature url="features/org.eclipse.rse.remotecdt_1.0.0.qualifier.jar" id="org.eclipse.rse.remotecdt" version="1.0.0.qualifier">
+      <category name="RSE Runtime only"/>
+   </feature>
+   <feature url="features/org.eclipse.rse.efs_1.0.0.qualifier.jar" id="org.eclipse.rse.efs" version="1.0.0.qualifier">
+      <category name="RSE Experimental Add-ons"/>
+   </feature>
+   <feature url="features/org.eclipse.tm.discovery_1.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="1.0.0.qualifier">
+      <category name="RSE Experimental Add-ons"/>
+   </feature>
+   <category-def name="RSE Runtime only" label="RSE_Runtime">
       <description>
          RSE Runtime-only features: no developer documentation or sources.
       </description>
@@ -35,4 +44,9 @@
          Remote System Explorer (RSE) with developer documentation and sources..
       </description>
    </category-def>
+   <category-def name="RSE Experimental Add-ons" label="RSE Experimental Add-ons">
+      <description>
+         Experimental add-ons for RSE
+      </description>
+   </category-def>
 </site>