diff --git a/ChangeLog b/ChangeLog
index 627c6a27312d..bc0c1b216218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-05  Alexandre Oliva  <aoliva@redhat.com>
+
+        * config.sub: Make sure to match an already-canonicalized
+        machine name (eg. mn10300-unknown-elf).
+
 2001-04-01  Alexandre Oliva  <aoliva@redhat.com>
 
 	* Makefile.in (CXX_FOR_TARGET_FOR_RECURSIVE_MAKE, RECURSE_FLAGS):
diff --git a/config.sub b/config.sub
index edfef570a5c6..86351bcb9130 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-version='2000-11-02'
+version='2001-04-06'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -940,6 +940,9 @@ case $basic_machine in
 		basic_machine=c4x-none
 		os=-coff
 		;;
+	*-unknown)
+               # Make sure to match an already-canonicalized machine name.
+                ;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1