diff --git a/releng/org.eclipse.tm.releng/build.properties b/releng/org.eclipse.tm.releng/build.properties
index b014b7c1482..85d2cc06d3d 100644
--- a/releng/org.eclipse.tm.releng/build.properties
+++ b/releng/org.eclipse.tm.releng/build.properties
@@ -46,8 +46,6 @@ JAVADOC14_HOME=/opt/public/common/ibm-java2-ppc-50/bin
 
 dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-linux-gtk.tar.gz,\
 http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.5.0/R200906151043/emf-runtime-2.5.0.zip,\
-http://download.eclipse.org/tools/orbit/downloads/drops/I20090816061335/bundles/org.apache.commons.net_2.0.0.v200905272248.jar,\
-http://download.eclipse.org/tools/orbit/downloads/drops/I20090816061335/bundles/org.apache.commons.net.source_2.0.0.v200905272248.jar,\
 http://rxtx.qbang.org/eclipse/downloads/RXTX-runtime-I20071016-1945.zip
 
 #what steps should we do? default: build.steps=buildZips,buildTests,generateDigests,test,publish,cleanup
diff --git a/releng/org.eclipse.tm.releng/buildExtra.xml b/releng/org.eclipse.tm.releng/buildExtra.xml
index 20ada30ba40..ff188d57c80 100644
--- a/releng/org.eclipse.tm.releng/buildExtra.xml
+++ b/releng/org.eclipse.tm.releng/buildExtra.xml
@@ -19,38 +19,17 @@
 	</target>
 
 	<target name="getDependencies">	
-		<echo message="Download, then unpack EMF, apache.commons.net and RXTX" />
+		<echo message="Download, then unpack EMF and RXTX" />
 		<ant target="getDependency"
 		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
 			<property name="url" value="${modeling.emf.runtime.url}" />
 			<property name="file" value="${modeling.emf.runtime.file}" />
 		</ant>
-
-		<echo message="Download, then unpack orbit bundles" />
-		<ant target="getDependency"
-		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
-			<property name="url" value="${tools.orbit.org.apache.commons.net_2.0.v200905272248.jar.url}" />
-			<property name="file" value="${tools.orbit.org.apache.commons.net_2.0.v200905272248.jar.file}" />
-			<property name="isUnpackedFile" value="true" />
-		</ant>
-		<ant target="getDependency"
-		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
-			<property name="url" value="${tools.orbit.org.apache.commons.net.source_2.0.v200905272248.jar.url}" />
-			<property name="file" value="${tools.orbit.org.apache.commons.net.source_2.0.v200905272248.jar.file}" />
-			<property name="isUnpackedFile" value="true" />
-		</ant>
 		<ant target="getDependency"
 		     antfile="${relengCommonBuilderDir}/tools/scripts/getDependencies.xml">
 			<property name="url" value="${downloads.RXTX.runtime.url}" />
 			<property name="file" value="${downloads.RXTX.runtime.file}" />
 		</ant>
-		<copy todir="${buildDir}/eclipse/plugins">
-			<fileset dir="${buildDir}/../downloads/">	
-				<include name="org.apache.commons.net_*.jar"/>
-				<include name="org.apache.commons.net.source_*.jar"/>
-			</fileset>
-		</copy>
-		<echo message="Done with orbit bundles" />
 	</target>
 
 	<target name="extraPackaging">
diff --git a/releng/org.eclipse.tm.releng/maps/releng.map b/releng/org.eclipse.tm.releng/maps/releng.map
new file mode 100644
index 00000000000..1db8b0b416c
--- /dev/null
+++ b/releng/org.eclipse.tm.releng/maps/releng.map
@@ -0,0 +1 @@
+feature@org.eclipse.tm.releng.master=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/releng/org.eclipse.tm.releng.master-feature