diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index faa36a6640a..a009f852d14 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -37,18 +37,6 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.terminals" />
 		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.remotecdt.wrapper" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.useractions.wrapper" />
-		</ant>
-		<ant antfile="${genericTargets}" target="${target}">
-			<property name="type" value="feature" />
-			<property name="id" value="org.eclipse.rse.wince.wrapper" />
-		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.remotecdt" />
@@ -77,6 +65,18 @@
 			<property name="type" value="feature" />
 			<property name="id" value="org.eclipse.rse.sdk" />
 		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.remotecdt.wrapper" />
+		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.useractions.wrapper" />
+		</ant>
+		<ant antfile="${genericTargets}" target="${target}">
+			<property name="type" value="feature" />
+			<property name="id" value="org.eclipse.rse.wince.wrapper" />
+		</ant>
 	</target>
 
 	<!-- ===================================================================== -->
@@ -134,13 +134,6 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.remotecdt.wrapper">
-	</target>
-	<target name="assemble.org.eclipse.rse.useractions.wrapper">
-	</target>
-	<target name="assemble.org.eclipse.rse.wince.wrapper">
-	</target>
-
 	<target name="assemble.org.eclipse.rse.useractions">
 		<property name="archiveName" value="RSE-useractions-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
@@ -183,6 +176,22 @@
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
+	<target name="assemble.org.eclipse.rse.remotecdt.wrapper">
+		<property name="archiveName" value="tmp_wrapper_remotecdt.zip"/>
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+		<antcall target="unpackUpdateJarsForPackaging" />
+	</target>
+	<target name="assemble.org.eclipse.rse.useractions.wrapper">
+		<property name="archiveName" value="tmp_wrapper_useractions.zip"/>
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+		<antcall target="unpackUpdateJarsForPackaging" />
+	</target>
+	<target name="assemble.org.eclipse.rse.wince.wrapper">
+		<property name="archiveName" value="tmp_wrapper_winceps.zip"/>
+		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+		<antcall target="unpackUpdateJarsForPackaging" />
+	</target>
+
 	<target name="unpackUpdateJarsForPackaging" depends="myInit">
 		<property name="tmpsite" value="${buildDirectory}/tmpsite" />
 		<mkdir dir="${tmpsite}/new/eclipse/features" />