diff --git a/ChangeLog b/ChangeLog
index 143db7b..78e3f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-08  Alan Modra  <amodra@bigpond.net.au>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (z80, z80-*): Handle.
+	* testsuite/config-sub.data: Add a test case.
+
 2008-06-16  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-sub.data: Strip stray whitespace.
diff --git a/config.sub b/config.sub
index a649350..053e738 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-06-16'
+timestamp='2008-09-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -288,7 +288,7 @@ case $basic_machine in
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -375,7 +375,7 @@ case $basic_machine in
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -1140,6 +1140,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index aba3c06..59598c9 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -139,3 +139,4 @@ x86_64-dicos			x86_64-pc-dicos
 x86_64-ericsson-dicos		x86_64-ericsson-dicos
 cegcc				arm-unknown-cegcc
 arm-cegcc			arm-unknown-cegcc
+z80-coff			z80-unknown-coff