diff --git a/ChangeLog b/ChangeLog
index 378889d..0a526f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-13  John Ericson  <john.ericson@obsidian.systems>
+
+	* config.sub: Don't recognize every *-unknown as a basic_machine.
+
 2018-07-12  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Replace large 'set_cc_for_build' shell variable,
diff --git a/config.sub b/config.sub
index c95acc6..5805242 100755
--- a/config.sub
+++ b/config.sub
@@ -739,6 +739,7 @@ case $basic_machine in
 	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| moxie-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
@@ -1263,9 +1264,6 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
 	*)
 		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
 		exit 1