diff --git a/ChangeLog b/ChangeLog
index 7f2dc8a..d706ee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-20  Phil Edwards  <pme@gcc.gnu.org>
+
+	* config.sub: Accept athlon_* patterns as synonyms for i686-pc.
+
 2002-08-20  Ben Elliston  <bje@redhat.com>
 
 	From Chris Demetriou <cgd@broadcom.com>:
diff --git a/config.sub b/config.sub
index 310b8d2..6033842 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-08-16'
+timestamp='2002-08-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -755,7 +755,7 @@ case $basic_machine in
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2)