diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties
index 51e3e7d9b3a..6709eb0a83d 100644
--- a/releng/org.eclipse.rse.build/build.properties
+++ b/releng/org.eclipse.rse.build/build.properties
@@ -24,21 +24,13 @@ mapVersionTag=HEAD
 generateFeatureVersionSuffix=true
 
 ##Packager
-## Bug 238309: WinCE is the only Platform specific feature, on x86-win32.
-## Need to build for x86-win32 even when running on Linux.
-configs=win32, win32, x86 & \
-linux, gtk, x86 & \
-	macosx, carbon, ppc
-groupConfigurations=true
+#configs=*,*,*
 #baseos=linux
 #basews=gtk
-#basearch=ppc #x86
+#basearch=x86
 ##bootclasspath=${java.home}/lib/*.jar
-#buildDirectory=${basedir}/build
-#collPlace=eclipse
-#collBase=.
-runPackager=true
-archivesFormat = *,*,*-antZip
+#runPackager=true
+#archivesFormat = *,*,*-antZip
 ### We do not build individual source bundles yet because Eclipse 3.3 dont understand it
 #individualSourceBundles=true
 
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 86cabc7b993..ca07c1eb771 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -74,91 +74,91 @@
 	<!-- Add one target for each root element and each configuration           -->
 	<!-- ===================================================================== -->
 
-	<target name="assemble.org.eclipse.rse.core.group.group.group">
+	<target name="assemble.org.eclipse.rse.core">
 		<property name="archiveName" value="RSE-runtime-core-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.dstore.group.group.group">
+	<target name="assemble.org.eclipse.rse.dstore">
 		<property name="archiveName" value="RSE-runtime-dstore-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.ftp.group.group.group">
+	<target name="assemble.org.eclipse.rse.ftp">
 		<property name="archiveName" value="RSE-runtime-ftp-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.local.group.group.group">
+	<target name="assemble.org.eclipse.rse.local">
 		<property name="archiveName" value="RSE-runtime-local-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.ssh.group.group.group">
+	<target name="assemble.org.eclipse.rse.ssh">
 		<property name="archiveName" value="RSE-runtime-ssh-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.telnet.group.group.group">
+	<target name="assemble.org.eclipse.rse.telnet">
 		<property name="archiveName" value="RSE-runtime-telnet-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.sdk.group.group.group">
+	<target name="assemble.org.eclipse.rse.sdk">
 		<property name="archiveName" value="RSE-SDK-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.useractions.group.group.group">
+	<target name="assemble.org.eclipse.rse.useractions">
 		<property name="archiveName" value="RSE-useractions-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.examples.group.group.group">
+	<target name="assemble.org.eclipse.rse.examples">
 		<property name="archiveName" value="RSE-examples-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.remotecdt.group.group.group">
+	<target name="assemble.org.eclipse.rse.remotecdt">
 		<property name="archiveName" value="RSE-remotecdt-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.wince.group.group.group">
+	<target name="assemble.org.eclipse.rse.wince">
 		<property name="archiveName" value="RSE-wince-incubation-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.tests.group.group.group">
+	<target name="assemble.org.eclipse.rse.tests">
 		<property name="archiveName" value="RSE-tests-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.tm.discovery.group.group.group">
+	<target name="assemble.org.eclipse.tm.discovery">
 		<property name="archiveName" value="TM-discovery-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.tm.terminal.sdk.group.group.group">
+	<target name="assemble.org.eclipse.tm.terminal.sdk">
 		<property name="archiveName" value="TM-terminal-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
 
-	<target name="assemble.org.eclipse.rse.terminals.group.group.group">
+	<target name="assemble.org.eclipse.rse.terminals">
 		<property name="archiveName" value="RSE-terminals-incubation-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
diff --git a/releng/org.eclipse.rse.build/maps/wince.map b/releng/org.eclipse.rse.build/maps/wince.map
index 8c1151edb75..c7ccc935b8f 100644
--- a/releng/org.eclipse.rse.build/maps/wince.map
+++ b/releng/org.eclipse.rse.build/maps/wince.map
@@ -1,4 +1,4 @@
-feature@org.eclipse.rse.wince=v20080606,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature
+feature@org.eclipse.rse.wince=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.wince-feature
 !! feature@org.eclipse.rse.wince.wrapper=v20080609a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.wince.wrapper-feature
 plugin@org.eclipse.rse.subsystems.wince=v20080604,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.rse.subsystems.wince
 plugin@org.eclipse.tm.rapi=v20080606,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/wince/org.eclipse.tm.rapi