diff --git a/ChangeLog b/ChangeLog
index 9233ca1..0244d1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-14  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (os): Move -es1800* case above -es*.
+	* testsuite/config-sub.data: Add several test cases.
+
 2018-01-14  Ben Elliston  <bje@gnu.org>
 
 	* config.sub (os): Remove overlapping pattern -svr4*.
diff --git a/config.sub b/config.sub
index e464057..f4e2837 100755
--- a/config.sub
+++ b/config.sub
@@ -1355,6 +1355,10 @@ case $os in
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
+	# es1800 is here to avoid being matched by es* (a different OS)
+	-es1800*)
+		os=-ose
+		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
@@ -1402,7 +1406,7 @@ case $os in
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
-	-sim | -es1800* | -xray | -os68k* | -v88r* \
+	-sim | -xray | -os68k* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
@@ -1491,9 +1495,6 @@ case $os in
 	-ose*)
 		os=-ose
 		;;
-	-es1800*)
-		os=-ose
-		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index a5c6846..72f8255 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -133,6 +133,7 @@ e500v2-wrs-linux				powerpc-wrs-linux-gnuspe
 e500v2-wrs-vxworks				powerpc-wrs-vxworksspe
 epiphany-elf					epiphany-unknown-elf
 epiphany					epiphany-unknown-none
+es1800						m68k-ericsson-ose
 fido-elf					fido-unknown-elf
 fido						fido-unknown-none
 fr30						fr30-unknown-none
@@ -226,6 +227,7 @@ m32rle						m32rle-unknown-none
 m32r						m32r-unknown-none
 m68000						m68000-unknown-none
 m68k						m68k-unknown-none
+m68k-es1800					m68k-unknown-ose
 m68knommu					m68k-unknown-linux-gnu
 m88k						m88k-unknown-none
 m88k-omron					m88k-omron-luna
@@ -355,6 +357,8 @@ or1k						or1k-unknown-none
 or32-linux					or32-unknown-linux-gnu
 or32						or32-unknown-coff
 os400						powerpc-ibm-os400
+ose68k						m68k-ericsson-ose
+ose						m68k-ericsson-ose
 parisc						hppa-unknown-linux-gnu
 pc98-freebsd					i386-pc-freebsd
 pdp10						pdp10-unknown-tops20