diff --git a/ChangeLog b/ChangeLog
index 85e1b8c..9bb9c24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-13  Ben Elliston  <bje@gnu.org>
+
+	* config.sub: Specify -elf as the default OS for spu.
+	(c4x-* | tic4x-*): Tidy formatting.
+	* testsuite/config-sub.data: Update tests.
+
 2006-05-13  Bruno Haible  <bruno@clisp.org>
 
 	* config.guess: Change support for Sun C/C++ 5.9 on Linux/x86 to
diff --git a/config.sub b/config.sub
index 710f348..4d936e2 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-05-12'
+timestamp='2006-05-13'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1366,6 +1366,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1375,9 +1378,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 1534ca2..1c78769 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -91,5 +91,6 @@ sparcv9v-elf			sparcv9v-unknown-elf
 sparc64v-elf			sparc64v-unknown-elf
 sparcv9v-solaris2.9		sparcv9v-unknown-solaris2.9
 sparc64v-solaris2.9		sparc64v-unknown-solaris2.9
-spu				spu-unknown-none
+spu				spu-unknown-elf
 spu-elf				spu-unknown-elf
+spu-linux			spu-unknown-linux-gnu