diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index de74ca3563f..d6f73adf837 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -134,7 +134,6 @@
 		<copy todir="${orbitDest}/plugins">
 			<fileset dir="${buildDirectory}/plugins">
 				<include name="org.apache.commons.net_*.jar"/>
-				<include name="org.apache.oro_*.jar"/>
 			</fileset>
 		</copy>
 	</target>
@@ -143,7 +142,6 @@
 		<copy todir="${orbitDest}/plugins">
 			<fileset dir="${buildDirectory}/plugins">
 				<include name="org.apache.commons.net.source_*.jar"/>
-				<include name="org.apache.oro.source_*.jar"/>
 			</fileset>
 		</copy>
 	</target>
@@ -232,19 +230,6 @@
 		</ant>
 		-->
 		<mkdir dir="${buildDirectory}/plugins"/>
-		<eclipse.fetch
-			elements="plugin@org.apache.oro"
-			buildDirectory="${buildDirectory}"
-			directory="${buildDirectory}/directory.txt"
-			fetchTag=""
-			configInfo="*,*,*"
-			baseLocation="${baseLocation}"
-		/>
-		<!-- Run generated fetch script -->
-		<ant antfile="${buildDirectory}/fetch_org.apache.oro.xml">
-			<property name="featureOnly" value="true"/>
-			<property name="featureAndPlugins" value="true"/>
-		</ant>
 		<eclipse.fetch
 			elements="plugin@org.apache.commons.net"
 			buildDirectory="${buildDirectory}"
@@ -263,19 +248,6 @@
 	<target name="preFetchOrbitSource" depends="myInit">
 		<!-- fetch Orbit stuff since I'm not sure how to get sources -->
 		<mkdir dir="${buildDirectory}/plugins"/>
-		<eclipse.fetch
-			elements="plugin@org.apache.oro.source"
-			buildDirectory="${buildDirectory}"
-			directory="${buildDirectory}/directory.txt"
-			fetchTag=""
-			configInfo="*,*,*"
-			baseLocation="${baseLocation}"
-		/>
-		<!-- Run generated fetch script -->
-		<ant antfile="${buildDirectory}/fetch_org.apache.oro.source.xml">
-			<property name="featureOnly" value="true"/>
-			<property name="featureAndPlugins" value="true"/>
-		</ant>
 		<eclipse.fetch
 			elements="plugin@org.apache.commons.net.source"
 			buildDirectory="${buildDirectory}"
diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index fdbbefdf927..6fb5f95aab4 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -4,13 +4,13 @@ feature@org.eclipse.rse=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/c
 feature@org.eclipse.rse.core=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
 feature@org.eclipse.rse.dstore=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
 feature@org.eclipse.rse.examples=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/examples/org.eclipse.rse.examples-feature
-feature@org.eclipse.rse.ftp=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
+feature@org.eclipse.rse.ftp=v200904201010,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
 feature@org.eclipse.rse.local=v200812041630,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
 feature@org.eclipse.rse.remotecdt=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt-feature
 !!feature@org.eclipse.rse.remotecdt.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.remotecdt.wrapper-feature
 feature@org.eclipse.rse.sdk=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
 feature@org.eclipse.rse.ssh=v200902011800,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
-feature@org.eclipse.rse.telnet=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
+feature@org.eclipse.rse.telnet=v200904201010,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
 feature@org.eclipse.rse.terminals=v200902020100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
 feature@org.eclipse.rse.tests=v200902082200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
 feature@org.eclipse.rse.useractions=v200902102200,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature
diff --git a/releng/org.eclipse.rse.build/maps/tmcore.map b/releng/org.eclipse.rse.build/maps/tmcore.map
index 2edbb27c212..21ee4b0644e 100644
--- a/releng/org.eclipse.rse.build/maps/tmcore.map
+++ b/releng/org.eclipse.rse.build/maps/tmcore.map
@@ -1,7 +1,2 @@
-plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.commons.net_1.4.1.v200803071935.jar
-plugin@org.apache.commons.net.source,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.commons.net.source_1.4.1.v200803071935.jar
-plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.oro_2.0.8.v200803061811.jar
-plugin@org.apache.oro.source,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.oro.source_2.0.8.v200803061811.jar
-
-! plugin@org.apache.commons.net=v200803061811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.commons.net
-! plugin@org.apache.oro=v200803061811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.oro
\ No newline at end of file
+plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/I20090407030832/bundles/org.apache.commons.net_2.0.0.v200903061330.jar
+plugin@org.apache.commons.net.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/I20090407030832/bundles/org.apache.commons.net.source_2.0.0.v200903061330.jar
diff --git a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml b/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
index 51a25807856..1f3fab9bdf8 100644
--- a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
@@ -86,7 +86,6 @@
 		<echo message="Unpack selected jars ..." />
 		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
 			<patternset>
-				<include name="**/org.apache.oro*.jar"/>
 				<include name="**/org.apache.commons.net*.jar"/>
 			</patternset>
 		</unzip>
diff --git a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml b/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
index 2690068bcdb..b3cc2255969 100644
--- a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
@@ -86,7 +86,6 @@
 		<echo message="Unpack selected jars ..." />
 		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
 			<patternset>
-				<include name="**/org.apache.oro*.jar"/>
 				<include name="**/org.apache.commons.net*.jar"/>
 			</patternset>
 		</unzip>
diff --git a/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml b/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml
index b481075a9f7..e685f2ab720 100644
--- a/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/runtime/customTargets.xml
@@ -85,7 +85,6 @@
 		<echo message="Unpack selected jars ..." />
 		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
 			<patternset>
-				<include name="**/org.apache.oro*.jar"/>
 				<include name="**/org.apache.commons.net*.jar"/>
 			</patternset>
 		</unzip>
diff --git a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml b/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
index 4588cd036fe..cc15e33f5b3 100644
--- a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
@@ -87,7 +87,6 @@
 		<echo message="Unpack selected jars ..." />
 		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
 			<patternset>
-				<include name="**/org.apache.oro*.jar"/>
 				<include name="**/org.apache.commons.net*.jar"/>
 			</patternset>
 		</unzip>
diff --git a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml b/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
index 7fa3c3a3ef3..648f1745f6f 100644
--- a/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/tests/customTargets.xml
@@ -90,7 +90,6 @@
 		</ant>
 		<unzip dest="${buildDirectory}/.." src="${downloadsDir}/${orbitFile}">
 			<patternset>
-				<include name="**/org.apache.oro*.jar" />
 				<include name="**/org.apache.commons.net*.jar" />
 			</patternset>
 		</unzip>
diff --git a/releng/org.eclipse.tm.releng/maps/tmcore.map b/releng/org.eclipse.tm.releng/maps/tmcore.map
index 2edbb27c212..21ee4b0644e 100644
--- a/releng/org.eclipse.tm.releng/maps/tmcore.map
+++ b/releng/org.eclipse.tm.releng/maps/tmcore.map
@@ -1,7 +1,2 @@
-plugin@org.apache.commons.net,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.commons.net_1.4.1.v200803071935.jar
-plugin@org.apache.commons.net.source,1.4.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.commons.net.source_1.4.1.v200803071935.jar
-plugin@org.apache.oro,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.oro_2.0.8.v200803061811.jar
-plugin@org.apache.oro.source,2.0.8=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20090124200431/bundles/org.apache.oro.source_2.0.8.v200803061811.jar
-
-! plugin@org.apache.commons.net=v200803061811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.commons.net
-! plugin@org.apache.oro=v200803061811,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.orbit/org.apache.oro
\ No newline at end of file
+plugin@org.apache.commons.net,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/I20090407030832/bundles/org.apache.commons.net_2.0.0.v200903061330.jar
+plugin@org.apache.commons.net.source,2.0.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/I20090407030832/bundles/org.apache.commons.net.source_2.0.0.v200903061330.jar
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 04a3e7d9869..a4b5a26be13 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -28,24 +28,16 @@
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.apache.oro" version="2.0.8" match="equivalent"/>
-      <import plugin="org.apache.commons.net" version="1.4.1" match="compatible"/>
+      <import plugin="org.apache.commons.net" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.rse.services" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.rse.subsystems.files.core" version="3.0.0" match="compatible"/>
       <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
    </requires>
 
-   <plugin
-         id="org.apache.oro"
-         download-size="30"
-         install-size="73"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.commons.net"
-         download-size="66"
-         install-size="189"
+         download-size="0"
+         install-size="0"
          version="0.0.0"
          unpack="false"/>
 
diff --git a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml
index c1c612934ee..96adcf35102 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/sourceTemplateFeature/feature.xml
@@ -13,8 +13,7 @@
                 <update url="http://download.eclipse.org/dsdp/tm/updates/3.0" label="%tmUpdateSiteName"/>
                 <discovery url="http://download.eclipse.org/dsdp/tm/updates/3.0" label="%tmUpdateSiteName"/>
         </url>
-        <plugin id="org.apache.commons.net.source" version="0.0.0" download-size="180" install-size="304" unpack="false" />
-        <plugin id="org.apache.oro.source" version="0.0.0" download-size="101" install-size="201" unpack="false" />
+        <plugin id="org.apache.commons.net.source" version="0.0.0" download-size="0" install-size="0" unpack="false" />
         <plugin id="org.eclipse.rse.services.files.ftp.source" version="0.0.0" download-size="0" install-size="0" unpack="false"/>
         <plugin id="org.eclipse.rse.subsystems.files.ftp.source" version="0.0.0" download-size="0" install-size="0" unpack="false"/>
 </feature>
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index 655accaeb52..94f5270f09c 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -34,17 +34,10 @@
       <import plugin="org.eclipse.rse.ui" version="3.0.0" match="compatible"/>
    </requires>
 
-   <plugin
-         id="org.apache.oro"
-         download-size="30"
-         install-size="73"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.apache.commons.net"
-         download-size="66"
-         install-size="189"
+         download-size="0"
+         install-size="0"
          version="0.0.0"
          unpack="false"/>
 
diff --git a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
index cb60215ffbd..9bddc886855 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
@@ -25,15 +25,8 @@
 
    <plugin
          id="org.apache.commons.net.source"
-         download-size="180"
-         install-size="304"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.oro.source"
-         download-size="101"
-         install-size="201"
+         download-size="0"
+         install-size="0"
          version="0.0.0"
          unpack="false"/>