diff --git a/org.eclipse.pde.build.tests/resources/allElements.xml b/org.eclipse.pde.build.tests/resources/allElements.xml
index 16a4098..203616f 100644
--- a/org.eclipse.pde.build.tests/resources/allElements.xml
+++ b/org.eclipse.pde.build.tests/resources/allElements.xml
@@ -24,67 +24,19 @@
 		</ant>
  	</target>
 	
- 	<target name="assemble.@ELEMENT@.win32.win32.x86">
+	<target name="assemble.@ELEMENT@.win32.win32.x86_64">
  		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86.zip"/>
+ 			<property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86_64.zip"/>
 		</ant>
 
  	</target>
-	
- 	<target name="assemble.@ELEMENT@.linux.gtk.ppc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.ppc.zip"/>
-		</ant>
- 	</target>
-	
- 	<target name="assemble.@ELEMENT@.linux.gtk.x86">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/>
-		</ant>
- 	</target>
-	
+ 	
  	<target name="assemble.@ELEMENT@.linux.gtk.x86_64">
  		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
  			<property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/>
 		</ant>
  	</target>
 	
- 	<target name="assemble.@ELEMENT@.linux.motif.x86">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.motif.x86.zip"/>
-		</ant>
- 	</target>
-	
- 	<target name="assemble.@ELEMENT@.solaris.motif.sparc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-solaris.motif.sparc.zip"/>
-		</ant>
- 	</target>
- 		
- 	<target name="assemble.@ELEMENT@.solaris.gtk.sparc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-solaris.gtk.sparc.zip"/>
-		</ant>
- 	</target>
-	
- 	<target name="assemble.@ELEMENT@.aix.motif.ppc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-aix.motif.ppc.zip"/>
-		</ant>
- 	</target>
-	
- 	<target name="assemble.@ELEMENT@.hpux.motif.PA_RISC">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-hpux.motif.PA_RISC.zip"/>
-		</ant>
- 	</target>
-	
- 	<target name="assemble.@ELEMENT@.macosx.carbon.ppc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-macosx.carbon.ppc.tar.gz"/>
-		</ant>
- 	</target>
-	
  	<target name="assemble.@ELEMENT@.group.group.group">
  		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
  			<property name="archiveName" value="${archiveNamePrefix}-group.zip"/>
diff --git a/org.eclipse.pde.build/templates/packager/customTargets.xml b/org.eclipse.pde.build/templates/packager/customTargets.xml
index d25f35c..1a62baf 100644
--- a/org.eclipse.pde.build/templates/packager/customTargets.xml
+++ b/org.eclipse.pde.build/templates/packager/customTargets.xml
@@ -13,9 +13,9 @@
 		<property name="archiveNamePrefix" value="${buildId}"/>
 	</target>
 	
-	<target name="assemble.win32.win32.x86.xml" depends="init">
+	<target name="assemble.win32.win32.x86_64.xml" depends="init">
 		<ant antfile="${assembleScriptName}" >
-			<property name="archiveName" value="${archiveNamePrefix}-win32.win32.win32.zip"/>
+			<property name="archiveName" value="${archiveNamePrefix}-win32.win32.x86_64.zip"/>
 		</ant>
 	</target>