diff --git a/ChangeLog b/ChangeLog
index 546da77..e424f88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-13  John Ericson  <john.ericson@obsidian.systems>
+
+	* config.sub: Error if there is more than four components.
+
 2018-05-12  Ben Elliston  <bje@gnu.org>
 
 	* config.sub: Remove do-nothing case.
diff --git a/config.sub b/config.sub
index 98835b4..6efa3f5 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-05-12'
+timestamp='2018-05-13'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -117,6 +117,10 @@ EOF
 
 # Separate into logical components for further validation
 case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
+		;;
 	*-*-*-*)
 		basic_machine=$field1-$field2
 		os=-$field3-$field4
@@ -385,11 +389,6 @@ case $basic_machine in
 	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
-		exit 1
-		;;
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \