diff --git a/ChangeLog b/ChangeLog
index c059269..d36033a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-18  Joel Brobecker  <brobecker@adacore.com>
+
+	* config.sub (*-lynx*178, *-lynx*5): New.
+	* testsuite/config-sub.data: Add powerpc-elf-lynxos,
+	powerpc-elf-lynxos5, powerpc-xcoff-lynxos178 testing.
+
 2012-02-14  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
 	* config.guess  (aarch64:Linux:*:*, aarch64_be:Linux:*:*): New.
diff --git a/config.sub b/config.sub
index c894da4..59bb593 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -225,6 +225,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index a0a633b..ee0890c 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -139,6 +139,9 @@ pc98-freebsd			i386-pc-freebsd
 picochip			picochip-unknown-none
 powerpc-bluegene		powerpc-ibm-cnk
 powerpc-cnk			powerpc-ibm-cnk
+powerpc-elf-lynxos		powerpc-elf-lynxos
+powerpc-elf-lynxos5		powerpc-elf-lynxos5
+powerpc-xcoff-lynxos178		powerpc-xcoff-lynxos178
 powerpc-haiku			powerpc-unknown-haiku
 ppcbe-elf			powerpc-unknown-elf
 ppcbe-none-elf			powerpc-none-elf