diff --git a/ChangeLog b/ChangeLog
index be3b3f9..ada3762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-20  Edward O'Callaghan  <eocallaghan@auroraux.org>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.guess (i86pc:AuroraUX:5.*:*): New.
+	(i86xen:AuroraUX:5.*:*): Likewise.
+	* config.sub (-auroraux, -auroraux*): New.
+	* testsuite/config-guess.data: Add test cases.
+	* testsuite/config-sub.data: Likewise.
+
 2009-11-19  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (i*86:Linux:*:*): Reintroduce dietlibc detection.
diff --git a/config.guess b/config.guess
index d53e309..dc84c68 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-19'
+timestamp='2009-11-20'
 
 # 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
@@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
diff --git a/config.sub b/config.sub
index 17c9145..2a55a50 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-11-07'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1256,6 +1256,9 @@ case $os in
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
+        -auroraux)
+	        os=-auroraux
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1277,8 +1280,8 @@ case $os in
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 189b067..e3b2596 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -43,3 +43,5 @@ s390x	5.6			SunOS		ignored	s390x-ibm-solaris2.6
 8664	1.0			Windows_NT	ignored	x86_64-pc-mks
 i386	4.2			LynxOS		ignored	i386-unknown-lynxos4.2
 PowerPC	4.2			LynxOS		ignored	powerpc-unknown-lynxos4.2
+i86pc	5.0			AuroraUX	ignored	i386-pc-auroraux5.0
+i86xen	5.0			AuroraUX	ignored	i386-pc-auroraux5.0
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index b1b577c..66c19e3 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -160,3 +160,5 @@ picochip			picochip-unknown-none
 i386-es				i386-pc-es
 ubicom32			ubicom32-unknown-none
 ubicom32-elf			ubicom32-unknown-elf
+i586-auroraux			i586-pc-auroraux
+i586-auroraux5.0		i586-pc-auroraux5.0