diff --git a/ChangeLog b/ChangeLog
index 281cbe1..aae7f0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-15  Ben Elliston  <bje@gnu.org>
+
+	From Josselin Mouette <joss@debian.org>:
+	* config.guess (SX-8:SUPER-UX:*:*): New.
+	* testsuite/config-guess.data: Add test case.
+
 2006-11-08  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (authenticamd:Interix*:[3456]*): Another AMD64.
diff --git a/config.guess b/config.guess
index c93201a..eeb9aef 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-11-08'
+timestamp='2006-11-15'
 
 # 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
@@ -1209,6 +1209,9 @@ EOF
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 82729e6..1cd8fc4 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -25,3 +25,4 @@ avr32	2.6.15			Linux		ignored	avr32-unknown-linux-gnu
 x86	6.0			Interix		ignored	i586-pc-interix6.0
 macppc	1.0			MirBSD		ignored	powerpc-unknown-mirbsd1.0
 authenticamd	6.0		Interix		ignored	x86_64-unknown-interix6.0
+SX-8	1.0			SUPER-UX	ignored	sx8-nec-superux1.0