diff --git a/ChangeLog b/ChangeLog
index eab90d4..47378ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-13  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (maybe_os): Remove second and duplicate *-xenix case
+	as only the first will match. Found by Shellcheck.
+	* testsuite/config-sub.data: Add test case.
+
 2018-01-13  Ben Elliston  <bje@gnu.org>
 
 	* config.sub (maybe_os): Remove hppa-next which can never match
diff --git a/config.sub b/config.sub
index 4473856..d10ced8 100755
--- a/config.sub
+++ b/config.sub
@@ -1531,9 +1531,6 @@ case $os in
 	-es1800*)
 		os=-ose
 		;;
-	-xenix)
-		os=-xenix
-		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index c95f14e..d3cdc2a 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -184,6 +184,7 @@ i386-solidbsd					i386-pc-solidbsd
 i386-sortix					i386-pc-sortix
 i386-udk					i386-pc-udk
 i386-vsta					i386-pc-vsta
+i386-xenix					i386-pc-xenix
 i486-elf					i486-pc-elf
 i586-auroraux5.0				i586-pc-auroraux5.0
 i586-auroraux					i586-pc-auroraux