diff --git a/ChangeLog b/ChangeLog
index 7cdcdaf..57ebdce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-23  Ben Elliston  <bje@gnu.org>
+
+	From Takahashi Yoshihiro <nyan@jp.FreeBSD.org>:
+	* config.guess (pc98:FreeBSD:*:*) Add special case.
+	* config.sub (pc98, pc98-*): New.
+	* testsuite/config-guess.data: Add test case.
+	* testsuite/config-sub.data: Ditto.
+
 2005-12-22  Ben Elliston  <bje@gnu.org>
 
 	From John Williams <jwilliams@itee.uq.edu.au>:
diff --git a/config.guess b/config.guess
index e3ef63f..10a8260 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-12-13'
+timestamp='2005-12-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
@@ -764,7 +764,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
diff --git a/config.sub b/config.sub
index 48b4c3b..8f7b738 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-12-22'
+timestamp='2005-12-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -818,6 +818,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 8ecacc3..caca95c 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -16,3 +16,4 @@ x86	5.0			Interix		ignored	i586-pc-interix5
 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
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index f85eb7b..16a0832 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -11,6 +11,7 @@ i386-linux			i386-pc-linux-gnu
 i386-netbsd			i386-pc-netbsd
 i386-openbsd			i386-pc-openbsd
 i386-freebsd			i386-pc-freebsd
+pc98-freebsd			i386-pc-freebsd
 i386-elf			i386-pc-elf
 i486-elf			i486-pc-elf
 i586-elf			i586-pc-elf