diff --git a/ChangeLog b/ChangeLog
index 20021d6..3dcc542 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
 2003-06-17  Ben Elliston  <bje@wasabisystems.com>
 
+	From by Stephen Thomas <stephen.thomas@superh.com>:
+	* config.guess (sh64*:*:*:Linux): New case.
+	* config.sub (sh64): Map to sh64-unknown.
+
+2003-06-17  Ben Elliston  <bje@wasabisystems.com>
+
+	Reported by Dennis Grevenstein <dennis@pcde.inka.de>:
 	* config.guess (sei:*:*:seiux): Detect SEIUX running on MIPS-based
 	workstations manufactured by Sumitomo Electric Industries.
 	* config.sub (sei, -sei*): Handle. 
-	Reported by Dennis Grevenstein <dennis@pcde.inka.de>.
 	
 2003-06-13  Svein E. Seldal  <Svein.Seldal@solidas.com>
 
diff --git a/config.guess b/config.guess
index b052dbb..4d0d905 100755
--- a/config.guess
+++ b/config.guess
@@ -885,6 +885,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
diff --git a/config.sub b/config.sub
index 8ec4d0e..0bdc334 100755
--- a/config.sub
+++ b/config.sub
@@ -858,6 +858,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks