diff --git a/ChangeLog b/ChangeLog
index ede8e79..a0af95f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-27  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Handle GNU/Linux on Hitachi SuperH. From Niibe
+	Yutaka <gniibe@chroot.org>.
+
 2000-05-19  Ben Elliston  <bje@redhat.com>
 
 	* config.sub: Recognise hppa64 as a valid cpu type. From Jeff Law.
diff --git a/config.guess b/config.guess
index 0ce538b..ca1b842 100755
--- a/config.guess
+++ b/config.guess
@@ -726,6 +726,10 @@ EOF
 		echo powerpc-unknown-linux-gnu${LIBC}
 		exit 0
 		;;
+	  shelf_linux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then