diff --git a/ChangeLog b/ChangeLog
index d4e3a88..7cdcdaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-22  Ben Elliston  <bje@gnu.org>
+
+	From John Williams <jwilliams@itee.uq.edu.au>:
+	* config.sub (mb, microblaze): New basic_machine.
+	* testsuite/config-sub.data: New tests.
+
 2005-12-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* config.guess (mips:Linux:*:*, mips64:Linux:*:*, i*86:Linux:*:*):
diff --git a/config.sub b/config.sub
index 2851647..48b4c3b 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-12-11'
+timestamp='2005-12-22'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -248,7 +248,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index aa71afe..f85eb7b 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -77,3 +77,5 @@ mt-elf				mt-unknown-elf
 rdos				i386-pc-rdos
 i586-rdos			i586-pc-rdos
 i386-linux-newlib		i386-pc-linux-newlib
+mb-elf				mb-unknown-elf
+microblaze-elf			microblaze-unknown-elf