diff --git a/ChangeLog b/ChangeLog
index 32b9f51..7e91f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-20  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (score, score-*): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2006-08-14  Thiemo Seufer  <ths@mips.com>
 	    Nigel Stephens  <nigel@mips.com>
 	    David Ung  <davidu@mips.com>
diff --git a/config.sub b/config.sub
index 53954db..fab0aa3 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-08-14'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -1370,6 +1371,9 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
         spu-*)
 		os=-elf
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 97f1674..f9469cd 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -101,3 +101,5 @@ xc16x				xc16x-unknown-none
 xc16x-elf			xc16x-unknown-elf
 sde-elf				mipsisa32-sde-elf
 mips-sde-elf			mips-sde-elf
+score				score-unknown-elf
+score-elf			score-unknown-elf