diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 83b40497403..e7b1b65df1c 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -37,10 +37,6 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.examples" />
 		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<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.tests" />
@@ -104,12 +100,6 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.efs">
-		<property name="archiveName" value="RSE-efs-${buildId}.zip"/>
-		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-		<antcall target="unpackUpdateJarsForPackaging" />
-	</target>
-
 	<target name="assemble.org.eclipse.rse.remotecdt">
 		<property name="archiveName" value="RSE-remotecdt-${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 be4d3f39dcd..07bf8e9d92d 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -1,7 +1,6 @@
 feature@org.eclipse.rse=v20070315,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
 feature@org.eclipse.rse.core=v20070402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
 feature@org.eclipse.rse.dstore=v20070402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.efs=v20070223,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.efs-feature
 feature@org.eclipse.rse.examples=v20070223,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
 feature@org.eclipse.rse.ftp=v20070402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
 feature@org.eclipse.rse.local=v20070402,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index fa532e1a4d6..93af6059ab7 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -24,15 +24,13 @@
 <table><tbody><tr><td>
 <ul>
 <li>TM 2.0M6 <b>requires Eclipse 3.3M6</b>. Platform Runtime is the minimum
-  requirement for dstore and ftp. Terminal-ssh and RSE-ssh also require the
-  <b>CVS Client Runtime</b> (The dependency on CVS Client Runtime should go away
-  again with M6 by resolving <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=175686">bug 175686</a>).</li>
+  requirement for core RSE and Terminal. Remotecdt requires CDT, and Discovery requires EMF.
 <li>Added a <b>milestone update site</b> for TM 2.0 milestone builds at
   <a href="http://download.eclipse.org/dsdp/tm/updates/milestones">http://download.eclipse.org/dsdp/tm/updates/milestones</a>.
   "Check for updates" will automatically reference this milestone update site, so you can get milestone
   patches from there [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=175241">175241</a>].</li>
-<li><b>Qualifiers of feature names</b> are currently missing the last digit 
-  due to Platform <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=176010">bug 176010</a>.</li>
+<li>The experimental <b>EFS Feature</b> has been made official, and functionality moved
+  into RSE Core. Thusu EFS support is no separate download any more but comes with RSE.</li>
 <li><b>Apache Commons.Net and ORO</b> are now distributed as single-jar bundles. The separate commons.net and ORO features 
 have been removed. The bundles are now directly included in the RSE FTP feature only.</li>
 <li><b>SystemRemoteResourceDialog.setPreSelection()</b> now works correctly [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=174944">174944</a>].
diff --git a/releng/org.eclipse.rse.build/template/index.php b/releng/org.eclipse.rse.build/template/index.php
index 02b671be54a..d028ab5c3c1 100755
--- a/releng/org.eclipse.rse.build/template/index.php
+++ b/releng/org.eclipse.rse.build/template/index.php
@@ -143,16 +143,6 @@
 			and file services, and gdbserver. Requires CDT and RSE.
 			Includes Source.
         </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 ssh
-			connections with limitations. See 
-			<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=170916">bug 170916</a> for details. Includes Source.
-        </td>
     </tr>
 	<tr><td><div align=left><img src = "OK.gif" width=19 height=23></div></td>
 		<td>All</td>
diff --git a/releng/org.eclipse.rse.build/template/package.count b/releng/org.eclipse.rse.build/template/package.count
index b6a7d89c68e..60d3b2f4a4c 100755
--- a/releng/org.eclipse.rse.build/template/package.count
+++ b/releng/org.eclipse.rse.build/template/package.count
@@ -1 +1 @@
-16
+15
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index ae8c6c9972a..9d69d0c772c 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -35,9 +35,6 @@
    <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"/>
    </feature>
-   <feature url="features/org.eclipse.rse.efs_2.0.0.qualifier.jar" id="org.eclipse.rse.efs" version="2.0.0.qualifier">
-      <category name="Target Management Add-ons and Stand-alone Offerings"/>
-   </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"/>
    </feature>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/options.txt b/rse/doc/org.eclipse.rse.doc.isv/options.txt
index 9fad7447fdb..5498eefef14 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.rse.doc.isv/options.txt
@@ -4,8 +4,6 @@
 -source 1.4
 -sourcepath "../org.eclipse.rse.connectorservice.dstore/src
 ;../org.eclipse.rse.core/src
-;../org.eclipse.rse.dstore.security/src
-;../org.eclipse.rse.eclipse.filesystem/src
 ;../org.eclipse.rse.files.ui/src
 ;../org.eclipse.rse.processes.ui/src
 ;../org.eclipse.rse.services/src
@@ -65,19 +63,12 @@ org.eclipse.rse.core.references
 org.eclipse.rse.core.servicesubsystem
 org.eclipse.rse.core.subsystems
 org.eclipse.rse.core.subsystems.util
-org.eclipse.rse.dstore.security
-org.eclipse.rse.dstore.security.preference
-org.eclipse.rse.dstore.security.util
-org.eclipse.rse.dstore.security.widgets
-org.eclipse.rse.dstore.security.wizards
 org.eclipse.rse.dstore.universal.miners
 org.eclipse.rse.dstore.universal.miners.command
 org.eclipse.rse.dstore.universal.miners.command.patterns
 org.eclipse.rse.dstore.universal.miners.environment
 org.eclipse.rse.dstore.universal.miners.filesystem
 org.eclipse.rse.dstore.universal.miners.processes
-org.eclipse.rse.eclipse.filesystem
-org.eclipse.rse.eclipse.filesystem.ui.actions
 org.eclipse.rse.files.ui
 org.eclipse.rse.files.ui.actions
 org.eclipse.rse.files.ui.compare
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index 677048a9dc2..bfa3bb0e91e 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -20,7 +20,6 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
-      <!-- Discovery, too in order to get Test feature, EFS feature or CVS Client -->
       <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
       <discovery label="%epMilestoneSiteName" url="http://download.eclipse.org/eclipse/updates/3.3milestones/site.xml"/>
    </url>
@@ -31,16 +30,16 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.jface.text"/>
       <import plugin="org.eclipse.search"/>
       <import plugin="org.eclipse.compare"/>
+      <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.ui.forms"/>
       <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.core.filesystem"/>
    </requires>
 
    <plugin
@@ -115,8 +114,15 @@
 
    <plugin
          id="org.eclipse.rse.subsystems.processes.shell.linux"
-         download-size="0"
-         install-size="0"
+         download-size="8"
+         install-size="22"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.eclipse.filesystem"
+         download-size="14"
+         install-size="27"
          version="0.0.0"
          unpack="false"/>