diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index d5ae9c3c2eb..0cc1e2f7166 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -28,7 +28,14 @@
 <li>An <b>Experimental RSE EFS Provider</b> is now available as a
   download, or from the <a href="http://download.eclipse.org/dsdp/tm/updates/">Update Site</a>.</li>
 -->
-<li>Fixed <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=164306">bug 164306</a> - FTP console shows plaintext passwords</li>
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=152826">152826</a>] Added an <b>ANSI / vt102 Terminal</b> as separate download (currently a stand-alone view not integrated with RSE; supports serial, ssh and telnet connections).</li>
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=158784">158784</a>] The <b>Remotecdt Launcher</b> now supports setting the gdbserver executable, port as well as gdb instance to use.</li> 
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=164306">164306</a>] FTP console no longer shows <b>plaintext passwords</b>.</li>
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=161238">161238</a>] [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=164304">164304</a>] FTP now supports VMS and some older MSDOS FTP Servers.</li> 
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=164292">164292</a>] Editors selection for remote files is now persistent</li> 
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=165891">165891</a>] <b>File permissions</b> are now consistently retained when copying inside a system.</li> 
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=166154">166154</a>] [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=166156">166156</a>] <b>Performance Improvements</b> in the Remote Systems Treeview (selections, deleting).</li> 
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=142478">142478</a>] The Preference option to <b>use deferred queries</b> is now always enabled and cannot be disabled.</li> 
 <li>Use 
   <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&chfieldfrom=2006-11-14&chfieldto=2006-12-16&chfield=resolution&cmdtype=doit">
   <!-- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&classification=DSDP&product=Target+Management&target_milestone=1.0.1&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&resolution=FIXED&resolution=WONTFIX&resolution=INVALID&resolution=WORKSFORME&cmdtype=doit"> -->
@@ -119,10 +126,16 @@ APIs better.
 </table>
 <table><tbody><tr><td>
 <ul>
-<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=161777">bug 161777</a>]:
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=161777">161777</a>]:
   <b>Moved</b> <b>HostShellAdapter</b> and <b>HostShellOutputStream</b> from remotecdt into 
   org.eclipse.rse.services.shells, thus making them API.</li>
-</li>
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=160353">160353</a>]
+  Synchronous queries (in the dispatch thread) are now deprecated everywhere. We want
+  to get rid of all nested event loops and run all queries in background jobs instead.
+  Asynchronous callbacks will be added to API in the future 
+  [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=166338">166338</a>].</li>
+<li>[<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=165891">165891</a>]
+  File permissions are now retained when copying files inside a system</li>.
 </ul>
 </td></tr></tbody></table>
 
@@ -137,7 +150,6 @@ APIs better.
 The following critical or major bugs are currently known.
 We'll strive to fix these as soon as possible.
 <ul>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=162883">bug 162883</a> - maj - [shell updating] No prompt on Solaris local shell</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=162993">bug 162993</a> - maj - ssh connection gets confused</li>
 </ul>
 -->
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
index 2f7d1d7c045..a771614c65e 100755
--- a/releng/org.eclipse.rse.build/template/index.php
+++ b/releng/org.eclipse.rse.build/template/index.php
@@ -52,7 +52,6 @@
        or later, e.g. 
        <a href="http://download.eclipse.org/eclipse/downloads/drops/R-3.2.1-200609210945/index.php">3.2.1</a>.
     </b></td></tr>
-    <tr><td>Earlier versions will <b>not</b> work!</td></tr>
     <tr><td>
       3.3M1, 
       3.3M2 and 
@@ -85,13 +84,66 @@
 		<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-SDK-@buildId@.zip">RSE-SDK-@buildId@.zip</a></td>
-</tr>
-
+	</tr>
 </table>
+
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
 	<tr><td colspan="2">&nbsp;</td></tr>
 </table>
+<table border="0" cellspacing="5" cellpadding="2" width="100%">
+	<tr>
+		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
+		<font face="Arial,Helvetica" color="#FFFFFF">Experimental add-ons (includes source, but no documentation yet)</font></b>
+		</td>
+	</tr>
+</table>
+<table border="0" cellspacing="2" cellpadding="0" width="100%">
+	<tr>
+		<td align="RIGHT" valign="TOP" width="7%">
+		   <div align="left"><b>Status</b></div>
+		</td>
+		<td width="7%"><b>Platform</b></td>
+		<td width="27%"><b>Download</b></td>
+		<td width="59%"><b>Notes</b></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@/TM-terminal-SDK-@buildId@.zip">TM-terminal-SDK-@buildId@.zip</a></td>
+        <td>
+			An ANSI / vt102 terminal emulator widget and view (with minor 
+			  <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal/README.txt?root=DSDP_Project&view=co">
+			limitations</a>).
+			It runs without RSE and includes pluggable connectors 
+			for serial line (through Sun Javacomm, see the 
+			  <a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial/README.txt?root=DSDP_Project&view=co">
+			installation notes</a>), ssh and telnet.
+        </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@/TM-discovery-@buildId@.zip">TM-discovery-@buildId@.zip</a></td>
+        <td><small>&nbsp;</small><br/>
+	    	An API and DNS-SD / Zeroconf based 
+			implementation for remote network service discovery. TM-discovery
+			requires EMF 2.2.0 or later to run. It runs stand-alone or
+			integrated with RSE.
+        </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-efs-@buildId@.zip">RSE-efs-@buildId@.zip</a></td>
+        <td><small>&nbsp;</small><br/>
+			An experimental Eclipse Filesystem (EFS) provider, which
+			uses RSE contributed file services. It currently works for accessing
+			remote file systems, but cannot be used to hold Projects of an 
+			Eclipse Workspace due to resource locking issues.
+        </td>
+    </tr>
+</table>
 
+<table border="0" cellspacing="5" cellpadding="2" width="100%">
+	<tr><td colspan="2">&nbsp;</td></tr>
+</table>
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
 	<tr>
 		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
@@ -187,47 +239,6 @@
 	</tr>
 </table>
 
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td colspan="2">&nbsp;</td>
-	</tr>
-</table>
-<table border="0" cellspacing="5" cellpadding="2" width="100%">
-	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
-		<font face="Arial,Helvetica" color="#FFFFFF">Experimental add-ons (includes source)</font></b>
-		</td>
-	</tr>
-	<tr>
-	    <td>Experimental add-ons are not yet fully supported.
-	    <ul><li>RSE-efs is an experimental Eclipse Filesystem (EFS) provider, which
-	       uses RSE contributed file services.</li>
-	    <li>TM-discovery is an experimental API and DNS-SD / Zeroconf based 
-	       implementation of remote network service discovery. TM-discovery
-	       requires EMF 2.2.0 or later to run. It can run stand-alone or
-	       integrated with RSE.</li>
-	    </ul>
-       </td>
-	</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="0" width="100%">
-	<tr>
-		<td align="RIGHT" valign="TOP" width="7%">
-		   <div align="left"><b>Status</b></div>
-		</td>
-		<td width="34%"><b>Platform</b></td>
-		<td width="59%"><b>Download</b></td>
-		<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-efs-@buildId@.zip">RSE-efs-@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@/TM-discovery-@buildId@.zip">TM-discovery-@buildId@.zip</a></td>
-        </tr>
-	</tr>
-</table>
-
 <!--
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
 	<tr>
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
index 8351c19397f..60d3b2f4a4c 100755
--- a/releng/org.eclipse.rse.build/template/package.count
+++ b/releng/org.eclipse.rse.build/template/package.count
@@ -1 +1 @@
-14
+15