diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 2d2cee09d56..62d9db99c1c 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -253,7 +253,11 @@
 			<mapper type="glob" from="org.eclipse.rse.sdk-*" to="RSE-SDK-*"/>
 		</move>
 		<move todir="${packageDirectory}/${dropDir}">
-			<fileset dir="${buildDirectory}/${buildLabel}" includes="org.eclipse.rse.*" excludes="org.eclipse.rse.sdk-*"/>
+			<fileset dir="${buildDirectory}/${buildLabel}" includes="org.eclipse.rse.examples-*"/>
+			<mapper type="glob" from="org.eclipse.rse.examples-*" to="RSE-examples-*"/>
+		</move>
+		<move todir="${packageDirectory}/${dropDir}">
+			<fileset dir="${buildDirectory}/${buildLabel}" includes="org.eclipse.rse.*" excludes="*.sdk-* *.examples-*"/>
 			<mapper type="glob" from="org.eclipse.rse.*" to="RSE-runtime-*"/>
 		</move>
 		<move todir="${packageDirectory}/${dropDir}">
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index 9e00222cc90..9b137bc4554 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -215,10 +215,9 @@ not make it into this build:
   <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=149080">bug 149080</a>
   instead. Due to the missing Unit Test Framework, automated tests could also
   not yet be added to this build.</li>
-<li>Examples are not yet available as downloadable package. A <b>CDT Launch Integration Example</b>,
-  a sample custom subsystem called <b>Daytime Example</b>,
-  as well as the <b>Tutorial Examples</b> from the ISV Docs are available 
-  from the <a href="http://www.eclipse.org/dsdp/tm/development/index.php">
+<li>The <b>CDT Launch Integration Example</b> is not yet available as a
+  download. It is available from the 
+  <a href="http://www.eclipse.org/dsdp/tm/development/index.php">
   RSE CVS Repository</a> instead.</li>
 <li>Jakarta Commons Net is not yet available for <b>FTP and Telnet</b> due to pending legal
   review. We are confident to get these completed in August though.<ul>
@@ -228,7 +227,6 @@ not make it into this build:
 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=154207">bug 154207</a> - maj - FileServiceSubsystem doesnt forward exception info</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=150949">bug 150949</a> - maj - RSE gets unusable when full logging is enabled</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=143462">bug 143462</a> - maj - [updating] Dirty remote editors do not get notified</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=143292">bug 143292</a> - maj - [mac] Move Resource dialog causes hang/crash</li>
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
index 10987f05909..1d9218232ee 100755
--- a/releng/org.eclipse.rse.build/template/index.php
+++ b/releng/org.eclipse.rse.build/template/index.php
@@ -153,31 +153,6 @@
         <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>
 </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>
-		<font face="Arial,Helvetica" color="#FFFFFF">Client Runtime</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="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-runtime-@buildId@.zip">RSE-runtime-@buildId@.zip</a></td>
-</tr>
-
-	</tr>
-</table>
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
 	<tr>
 		<td colspan="2">&nbsp;</td>
@@ -185,7 +160,7 @@
 </table>
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
 	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
+		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
 		<font face="Arial,Helvetica" color="#FFFFFF">Examples (includes source)</font></b>
 		</td>
 	</tr>
@@ -204,6 +179,8 @@
 
 	</tr>
 </table>
+
+<!--
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
 	<tr>
 		<td colspan="2">&nbsp;</td>
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
index b4de3947675..48082f72f08 100755
--- a/releng/org.eclipse.rse.build/template/package.count
+++ b/releng/org.eclipse.rse.build/template/package.count
@@ -1 +1 @@
-11
+12