diff --git a/ChangeLog b/ChangeLog
index 774eef1..a58aefb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-23  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Detect AtheOS on x86 systems.
+	Based on info provided by Taco Witte <tcwitte@wish.net>.
+
 2001-08-23  Geoffrey Keating  <geoffk@redhat.com>
 
 	* config.sub: Add stormy16-elf.
diff --git a/config.guess b/config.guess
index cd430f6..1e2f91f 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-08-21'
+timestamp='2001-08-23'
 
 # 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
@@ -1114,6 +1114,9 @@ EOF
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
 	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2