diff --git a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml b/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
index 6aafc99c095..d958a8873b2 100644
--- a/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/doc/customTargets.xml
@@ -80,6 +80,20 @@
 			<property name="file" value="${emfFile}" />
 			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml" />
 		</ant>
+		<!-- Important: This must be the last dependency downloaded, because the
+				getDependency target strips versions from all plug-ins -->
+		<echo message="Download Orbit Bundles ..." />
+		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
+			<property name="url" value="${orbitURL}"/>
+			<property name="file" value="${orbitFile}"/>
+		</ant>
+		<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>
 	</target>
 
 	<!-- ===================================================================== -->
diff --git a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml b/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
index be71be5ff67..36a5ad610d3 100644
--- a/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/examples/customTargets.xml
@@ -80,6 +80,20 @@
 			<property name="file" value="${emfFile}" />
 			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml" />
 		</ant>
+		<!-- Important: This must be the last dependency downloaded, because the
+				getDependency target strips versions from all plug-ins -->
+		<echo message="Download Orbit Bundles ..." />
+		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
+			<property name="url" value="${orbitURL}"/>
+			<property name="file" value="${orbitFile}"/>
+		</ant>
+		<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>
 	</target>
 
 	<!-- ===================================================================== -->
diff --git a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml b/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
index b8766e7cfac..3a9007473e7 100644
--- a/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
+++ b/releng/org.eclipse.tm.releng/builder/sdk/customTargets.xml
@@ -81,6 +81,20 @@
 			<property name="file" value="${emfFile}" />
 			<property name="isUnpackedFile" value="${buildDirectory}/plugins/org.eclipse.emf.ecore/plugin.xml" />
 		</ant>
+		<!-- Important: This must be the last dependency downloaded, because the
+				getDependency target strips versions from all plug-ins -->
+		<echo message="Download Orbit Bundles ..." />
+		<ant target="getBundle" antfile="${buildDirectory}/../org.eclipse.modeling.common.releng/scripts/getDependenciesHelper.xml">
+			<property name="url" value="${orbitURL}"/>
+			<property name="file" value="${orbitFile}"/>
+		</ant>
+		<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>
 	</target>
 
 	<!-- ===================================================================== -->