diff --git a/ChangeLog b/ChangeLog
index d6a27b0..f311492 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-08  Kazu Hirata  <kazu@codesourcery.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub: Recognize fido and fido-*.
+	* testsuite/config-sub.data: Add test cases.
+
 2006-11-30  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (SX-7:SUPER-UX:*:*): New.
diff --git a/config.sub b/config.sub
index 7ccee73..4b8cc7b 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-11-07'
+timestamp='2006-12-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -245,7 +245,7 @@ case $basic_machine in
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
@@ -324,7 +324,7 @@ case $basic_machine in
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index b86a584..63f7a69 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -105,3 +105,5 @@ score				score-unknown-elf
 score-elf			score-unknown-elf
 sh5el-elf			sh5le-unknown-elf
 sh5el-netbsd			sh5le-unknown-netbsd
+fido-elf			fido-unknown-elf
+fido				fido-unknown-none