diff --git a/org.eclipse.pde.build/scripts/productBuild/allElements.xml b/org.eclipse.pde.build/scripts/productBuild/allElements.xml
index 1c2033f..ee1c7b1 100644
--- a/org.eclipse.pde.build/scripts/productBuild/allElements.xml
+++ b/org.eclipse.pde.build/scripts/productBuild/allElements.xml
@@ -84,20 +84,6 @@
 		</ant>
  	</target>
 	
-	<property name="assemble.org.eclipse.pde.build.container.feature.linux.motif.x86" value="true" />
- 	<target name="assemble.org.eclipse.pde.build.container.feature.linux.motif.x86">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-linux.motif.x86.zip"/>
-		</ant>
- 	</target>
-	
-	<property name="assemble.org.eclipse.pde.build.container.feature.solaris.motif.sparc" value="true" />
- 	<target name="assemble.org.eclipse.pde.build.container.feature.solaris.motif.sparc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-solaris.motif.sparc.zip"/>
-		</ant>
- 	</target>
- 		
 	<property name="assemble.org.eclipse.pde.build.container.feature.solaris.gtk.sparc" value="true" />
  	<target name="assemble.org.eclipse.pde.build.container.feature.solaris.gtk.sparc">
  		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
@@ -105,20 +91,6 @@
 		</ant>
  	</target>
 	
-	<property name="assemble.org.eclipse.pde.build.container.feature.aix.motif.ppc" value="true" />
- 	<target name="assemble.org.eclipse.pde.build.container.feature.aix.motif.ppc">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-aix.motif.ppc.zip"/>
-		</ant>
- 	</target>
-	
-	<property name="assemble.org.eclipse.pde.build.container.feature.hpux.motif.PA_RISC" value="true" />
- 	<target name="assemble.org.eclipse.pde.build.container.feature.hpux.motif.PA_RISC">
- 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
- 			<property name="archiveName" value="${archiveNamePrefix}-hpux.motif.PA_RISC.zip"/>
-		</ant>
- 	</target>
-	
 	<property name="assemble.org.eclipse.pde.build.container.feature.macosx.carbon.ppc" value="true" />
  	<target name="assemble.org.eclipse.pde.build.container.feature.macosx.carbon.ppc">
  		<ant antfile="${assembleScriptName}" dir="${buildDirectory}">			
diff --git a/org.eclipse.pde.build/templates/headless-build/build.properties b/org.eclipse.pde.build/templates/headless-build/build.properties
index 432b6e0..3a3451a 100644
--- a/org.eclipse.pde.build/templates/headless-build/build.properties
+++ b/org.eclipse.pde.build/templates/headless-build/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2011 IBM Corporation and others.
+# Copyright (c) 2003, 2016 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -42,7 +42,7 @@
 
 # The list of {os, ws, arch} configurations to build.  This 
 # value is a '&' separated list of ',' separate triples.  For example, 
-#     configs=win32,win32,x86 & linux,motif,x86
+#     configs=win32,win32,x86 & linux,gtk,x86
 # By default the value is *,*,*
 configs = *, *, *
 #configs=win32, win32, x86 & \
@@ -51,11 +51,7 @@
 #	linux, gtk, ppc & \
 #	linux, gtk, x86 & \
 #	linux, gtk, x86_64 & \
-#	linux, motif, x86 & \
-#	solaris, motif, sparc & \
 #	solaris, gtk, sparc & \
-#	aix, motif, ppc & \
-#	hpux, motif, ia64_32 & \
 #	macosx, carbon, ppc & \
 #	macosx, carbon, x86 & \
 #	macosx, cocoa, ppc & \
@@ -75,11 +71,7 @@
 #	linux, gtk, ppc - antZip &\
 #    linux, gtk, x86 - antZip& \
 #	linux, gtk, x86_64 - antZip& \
-# linux, motif, x86 - antZip& \
-#	solaris, motif, sparc - antZip& \
 #	solaris, gtk, sparc - antZip& \
-#	aix, motif, ppc - antZip& \
-#	hpux, motif, PA_RISC - antZip& \
 #	macosx, carbon, ppc - antZip
 
 #Allow cycles involving at most one bundle that needs to be compiled with the rest being binary bundles.
diff --git a/org.eclipse.pde.build/templates/packager/customTargets.xml b/org.eclipse.pde.build/templates/packager/customTargets.xml
index 64d118c..51f8266 100644
--- a/org.eclipse.pde.build/templates/packager/customTargets.xml
+++ b/org.eclipse.pde.build/templates/packager/customTargets.xml
@@ -37,36 +37,12 @@
 		</ant>
 	</target>
 		
-	<target name="assemble.linux.motif.x86.xml">
-		<ant antfile="${assembleScriptName}" >
-			<property name="archiveName" value="${archiveNamePrefix}-linux.motif.x86.zip"/>
-		</ant>
-	</target>
-	
-	<target name="assemble.solaris.motif.sparc.xml">
-		<ant antfile="${assembleScriptName}" >
-			<property name="archiveName" value="${archiveNamePrefix}-solaris.motif.sparc.zip"/>
-		</ant>
-	</target>
-
 	<target name="assemble.solaris.gtk.sparc.xml">
 		<ant antfile="${assembleScriptName}" >
 			<property name="archiveName" value="${archiveNamePrefix}-solaris.gtk.sparc.zip"/>
 		</ant>
 	</target>
 	
-	<target name="assemble.aix.motif.ppc.xml">
-		<ant antfile="${assembleScriptName}" >
-			<property name="archiveName" value="${archiveNamePrefix}-aix.motif.ppc.zip"/>
-		</ant>
-	</target>
-	
-	<target name="assemble.hpux.motif.PA_RISC.xml">
-		<ant antfile="${assembleScriptName}" >
-			<property name="archiveName" value="${archiveNamePrefix}-hpux.motif.PA_RISC.zip"/>
-		</ant>
-	</target>
-	
 	<target name="assemble.macosx.carbon.ppc.xml">
 		<ant antfile="${assembleScriptName}" >
 			<property name="archiveName" value="${archiveNamePrefix}-macosx.carbon.ppc.zip"/>
diff --git a/org.eclipse.pde.build/templates/packager/packager.properties b/org.eclipse.pde.build/templates/packager/packager.properties
index 293c593..b86f61c 100644
--- a/org.eclipse.pde.build/templates/packager/packager.properties
+++ b/org.eclipse.pde.build/templates/packager/packager.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2007 IBM Corporation and others.
+# Copyright (c) 2006, 2016 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -25,11 +25,7 @@
 #	linux, gtk, ppc &\
 # linux, gtk, x86 & \
 #	linux, gtk, x86_64 & \
-#	linux, motif, x86 & \
-#	solaris, motif, sparc & \
 #	solaris, gtk, sparc & \
-#	aix, motif, ppc & \
-#	hpux, motif, PA_RISC & \
 #	macosx, carbon, ppc
 
 #Set this variable to normalize plug-in and feature names while packaging 
@@ -97,11 +93,7 @@
 #	linux, gtk, ppc - antZip &\
 #    linux, gtk, x86 - antZip& \
 #	linux, gtk, x86_64 - antZip& \
-# linux, motif, x86 - antZip& \
-#	solaris, motif, sparc - antZip& \
 #	solaris, gtk, sparc - antZip& \
-#	aix, motif, ppc - antZip& \
-#	hpux, motif, PA_RISC - antZip& \
 #	macosx, carbon, ppc - antZip
 
 # extra arguments to be passed to zip / unzip (-y is usually used on unix for zip)
diff --git a/org.eclipse.pde.build/templates/packager/packaging.properties b/org.eclipse.pde.build/templates/packager/packaging.properties
index be53c51..755bd3f 100644
--- a/org.eclipse.pde.build/templates/packager/packaging.properties
+++ b/org.eclipse.pde.build/templates/packager/packaging.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2006, 2007 IBM Corporation and others.
+# Copyright (c) 2006, 2016 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -17,12 +17,9 @@
 root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 
 root.win32.win32.x86=eclipse.exe, eclipsec.exe
-root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html,icon.xpm
 root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
 root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm
 root.linux.gtk.ppc=eclipse
 root.macosx.carbon.ppc=eclipse,Eclipse.app/
 root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
-root.aix.motif.ppc=eclipse
-root.hpux.motif.PA_RISC=eclipse
 root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm