diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index e7b1b65df1c..93053934d28 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -25,6 +25,10 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.ssh" />
 		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.telnet" />
+		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.sdk" />
@@ -88,6 +92,12 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
+	<target name="assemble.org.eclipse.rse.telnet">
+		<property name="archiveName" value="RSE-runtime-telnet-${buildId}.zip"/>
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+		<antcall target="unpackUpdateJarsForPackaging" />
+	</target>
+
 	<target name="assemble.org.eclipse.rse.sdk">
 		<property name="archiveName" value="RSE-SDK-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index eb9be202c86..f18beff08e7 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -7,6 +7,7 @@ feature@org.eclipse.rse.local=v20070406,:pserver:anonymous:none@dev.eclipse.org:
 feature@org.eclipse.rse.remotecdt=v20070406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt-feature
 feature@org.eclipse.rse.sdk=v20070406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
 feature@org.eclipse.rse.ssh=v20070406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
+feature@org.eclipse.rse.telnet=v20070406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
 feature@org.eclipse.rse.tests=v20070406,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
 plugin@org.eclipse.dstore.core=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
 plugin@org.eclipse.dstore.doc.isv=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.dstore.doc.isv
@@ -15,6 +16,7 @@ plugin@org.eclipse.rse=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroo
 plugin@org.eclipse.rse.connectorservice.dstore=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
 plugin@org.eclipse.rse.connectorservice.local=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
 plugin@org.eclipse.rse.connectorservice.ssh=v20070425,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.ssh
+plugin@org.eclipse.rse.connectorservice.telnet=v20070425,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet
 plugin@org.eclipse.rse.core=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
 plugin@org.eclipse.rse.doc.isv=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.isv
 plugin@org.eclipse.rse.doc.user=v20070402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/doc/org.eclipse.rse.doc.user
@@ -31,6 +33,7 @@ plugin@org.eclipse.rse.services.dstore=v20070509,:pserver:anonymous:none@dev.ecl
 plugin@org.eclipse.rse.services.files.ftp=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
 plugin@org.eclipse.rse.services.local=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
 plugin@org.eclipse.rse.services.ssh=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
+plugin@org.eclipse.rse.services.telnet=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
 plugin@org.eclipse.rse.services=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
 plugin@org.eclipse.rse.shells.ui=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
 plugin@org.eclipse.rse.subsystems.files.core=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
@@ -46,6 +49,7 @@ plugin@org.eclipse.rse.subsystems.shells.core=v20070509,:pserver:anonymous:none@
 plugin@org.eclipse.rse.subsystems.shells.dstore=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
 plugin@org.eclipse.rse.subsystems.shells.local=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
 plugin@org.eclipse.rse.subsystems.shells.ssh=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
+plugin@org.eclipse.rse.subsystems.shells.telnet=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
 plugin@org.eclipse.rse.tests=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
 plugin@org.eclipse.rse.tests.framework=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
 plugin@org.eclipse.rse.ui=v20070509,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index 62050e9132d..d5a10d29686 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -34,9 +34,14 @@
 <li><b>Digital Signing</b> of plugins has been re-enabled now that the Platform 
   issues with it are fixed. All TM stuff on the update sites is digitally
   signed with the Eclipse certificate.</li>
-<li><b>Added User Actions and Import/Export</b> to downloadable builds -
-  User Actions still need some fixing, but Import/Export should work fine
+<li><b>Added Import/Export</b> to downloadable builds -
+  User Actions needs to be deferred to after TM 2.0
   [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=170909">170909</a>].</li>
+<li><b>Added a Telnet Subsystem</b>. It can be activated by selecting the new
+  system type "Telnet Only", or by choosing it from the available services
+  on Linux, Unix or AIX. The telnet subsystem is currently still experimental
+  because of problems when passing invalid credentials.
+  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=178201">178201</a>].</li>
 <li><b>System Type Labels are now translatable</b>
   [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=180688">180688</a>].</li>
 <li><b>Fixed some Encoding Issues</b>, most prominently with BIDI support
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
index 1380d07620f..e29bb9ddb7e 100755
--- a/releng/org.eclipse.rse.build/template/index.php
+++ b/releng/org.eclipse.rse.build/template/index.php
@@ -219,6 +219,9 @@
 	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
         <td>All</td>
         <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-ssh-@buildId@.zip">RSE-runtime-ssh-@buildId@.zip</a></td></tr>
+	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
+        <td>All</td>
+        <td><a href="http://www.eclipse.org/downloads/download.php?file=/dsdp/tm/downloads/drops/@dropDir@/RSE-runtime-telnet-@buildId@.zip">RSE-runtime-telnet-@buildId@.zip</a> (<i>Experimental</i>)</td></tr>
 </table>
 
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
index 60d3b2f4a4c..b6a7d89c68e 100755
--- a/releng/org.eclipse.rse.build/template/package.count
+++ b/releng/org.eclipse.rse.build/template/package.count
@@ -1 +1 @@
-15
+16
diff --git a/rse/features/org.eclipse.rse-feature/build.properties b/rse/features/org.eclipse.rse-feature/build.properties
index e39dc86e4b6..85f5b38e21e 100644
--- a/rse/features/org.eclipse.rse-feature/build.properties
+++ b/rse/features/org.eclipse.rse-feature/build.properties
@@ -13,8 +13,8 @@ bin.includes = feature.xml,\
                feature.properties,\
                epl-v10.html,\
                eclipse_update_120.jpg
-generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
-generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
-generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
+#generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
+#generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
+#generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
+#generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
+#generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index 1f95697a8fd..d7744c569ca 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -43,6 +43,10 @@
          id="org.eclipse.rse.ssh"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.rse.telnet"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.rse"
          download-size="7"
diff --git a/rse/features/org.eclipse.rse.sdk-feature/build.properties b/rse/features/org.eclipse.rse.sdk-feature/build.properties
index e39dc86e4b6..6d57bb2a58d 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/build.properties
+++ b/rse/features/org.eclipse.rse.sdk-feature/build.properties
@@ -13,8 +13,9 @@ bin.includes = feature.xml,\
                feature.properties,\
                epl-v10.html,\
                eclipse_update_120.jpg
-generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
-generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
-generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
-generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
 generate.feature@org.eclipse.rse.core.source=org.eclipse.rse.core
+generate.feature@org.eclipse.rse.dstore.source=org.eclipse.rse.dstore
+generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
+generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
+generate.feature@org.eclipse.rse.ssh.source=org.eclipse.rse.ssh
+generate.feature@org.eclipse.rse.telnet.source=org.eclipse.rse.telnet
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index bb8afead3f7..c46e374b4ab 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -46,6 +46,10 @@
          id="org.eclipse.rse.ssh.source"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.rse.telnet.source"
+         version="0.0.0"/>
+
    <plugin
          id="org.eclipse.rse.sdk"
          download-size="7"