diff --git a/ChangeLog b/ChangeLog
index 626e3af..01b0e72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (*:FreeBSD:*:*): Switch on ${UNAME_PROCESSOR}.
+	* testsuite/config-guess.data: Remove hard to test FreeBSD cases.
+
 2011-08-16  Roland McGrath  <mcgrathr@google.com>
 
 	* config.sub (32eb, 32el, 64eb, 64el): New (pseudo-)CPUs.
diff --git a/config.guess b/config.guess
index b02565c..f7dd69e 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011 Free Software Foundation, Inc.
 
-timestamp='2011-06-03'
+timestamp='2011-08-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
@@ -792,13 +792,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index c9c83dc..b6be7a8 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -16,11 +16,9 @@ x86	5.2			Interix		ignored	i586-pc-interix5.2
 ppc64	2.6.9-22		Linux		ignored	powerpc64-unknown-linux-gnu
 vax	2.6.15			Linux		ignored	vax-dec-linux-gnu
 i586	ignored			rdos		ignored	i586-pc-rdos
-pc98	7.0			FreeBSD		ignored	i386-unknown-freebsd7.0
 i586	1.0			SolidBSD	ignored	i586-unknown-solidbsd1.0
 i686	5.4-1-686		GNU/kFreeBSD	ignored	i686-unknown-kfreebsd5.4-gnu
 EM64T	5.2			Interix		ignored	x86_64-unknown-interix5.2
-amd64	5.2			FreeBSD		ignored	x86_64-unknown-freebsd5.2
 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