diff --git a/ChangeLog b/ChangeLog
index 4422754..760ca25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-17  Michael Eager  <eager@eagercon.com>
+
+	* config.sub: Add Microblaze aliases.
+	* testsuite/config-sub.data: Add test cases.
+
 2009-06-11  Steven G. Johnson  <stevenj.mit@gmail.com>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.sub b/config.sub
index eb0389a..32d764c 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-11'
+timestamp='2009-08-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -149,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
@@ -340,7 +340,7 @@ case $basic_machine in
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -726,6 +726,9 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index ab090a3..e2873ce 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -152,3 +152,5 @@ i386-aros			i386-pc-aros
 moxie-elf			moxie-unknown-elf
 powerpc-cnk			powerpc-ibm-cnk
 powerpc-bluegene		powerpc-ibm-cnk
+microblaze			microblaze-unknown-none
+microblaze-linux		microblaze-unknown-linux-gnu