diff --git a/ChangeLog b/ChangeLog
index 21411b2..64806ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-06-14  Jerome Lambourg  <lambourg@adacore.com>
+
+	* config.sub (e500v[12], e500v[12]-*): Decode basic machine as a
+	powerpc alias, and add an "spe" suffix to the OS for e500v1|2 ABI
+	selection.
+	* testsuite/config-sub.data: Add tests for e500v[12]-elf,
+	e500v2-wrs-vxworks, e500v2-vxworksae and e500v2-wrs-linux.
+
 2016-05-15  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Improve help when a system is not recognised.
diff --git a/config.sub b/config.sub
index 6d86a1e..eccd218 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2016-05-10'
+timestamp='2016-06-14'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -643,6 +643,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 07318c9..53c0ab9 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -75,6 +75,11 @@ crisv32-linux			crisv32-axis-linux-gnu
 dicos				i686-pc-dicos
 djgpp				i586-pc-msdosdjgpp
 e2k-linux			e2k-unknown-linux-gnu
+e500v1-elf			powerpc-unknown-elfspe
+e500v2-elf			powerpc-unknown-elfspe
+e500v2-wrs-vxworks		powerpc-wrs-vxworksspe
+e500v2-vxworksae		powerpc-wrs-vxworksaespe
+e500v2-wrs-linux		powerpc-wrs-linux-gnuspe
 epiphany-elf			epiphany-unknown-elf
 epiphany			epiphany-unknown-none
 fido-elf			fido-unknown-elf