diff --git a/ChangeLog b/ChangeLog
index 78e3f6e..6f22c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-28  Ben Elliston  <bje@gnu.org>
+
+	From boris.seve@drillscan.com.
+	* config.guess (padre:Linux:*:*): New.
+	* testsuite/config-guess.data: Add a test case.
+
 2008-09-08  Alan Modra  <amodra@bigpond.net.au>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.guess b/config.guess
index c7607c7..9642e8e 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-04-14'
+timestamp='2008-09-28'
 
 # 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
@@ -935,6 +935,9 @@ EOF
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index f00f672..71ff1c8 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -33,4 +33,5 @@ i386	1.0			MINGW		ignored	i386-pc-mingw32
 SX-8R	1.0			SUPER-UX	ignored	sx8r-nec-superux1.0
 i86xen	5.6			SunOS		ignored	i386-pc-solaris2.6
 IA64	6.0			Interix		ignored	ia64-unknown-interix6.0
-BePC	1.0			Haiku		ignore	i586-pc-haiku
+BePC	1.0			Haiku		ignored	i586-pc-haiku
+padre	2.6.15			Linux		ignore	sparc-unknown-linux-gnu