diff --git a/ChangeLog b/ChangeLog
index 83da12e..6694150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-13  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (maybe_os): Remove duplicate case for sh.
+	* testsuite/config-sub.data: Add test cases for sh and sh-elf.
+
 2018-01-13  Ben Elliston  <bje@gnu.org>
 
 	* config.sub (maybe_os): Remove duplicate patterns for sparc,
diff --git a/config.sub b/config.sub
index 37be141..578657d 100755
--- a/config.sub
+++ b/config.sub
@@ -1098,10 +1098,6 @@ case $basic_machine in
 	sequent)
 		basic_machine=i386-sequent
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 2701eaa..2a4c3bf 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -403,6 +403,8 @@ s390-ibm-zvmoe					s390-ibm-zvmoe
 score-elf					score-unknown-elf
 score						score-unknown-elf
 sde-elf						mipsisa32-sde-elf
+sh						sh-unknown-none
+sh-elf						sh-unknown-elf
 sh1-elf						sh1-unknown-elf
 sh1le-elf					sh1le-unknown-elf
 sh1						sh1-unknown-none