diff --git a/ChangeLog b/ChangeLog
index fde8257..65d180d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-05  Ben Elliston  <bje@gnu.org>
+
+	* config.sub (mips64r5900, mips64r5900el): New machines.
+	* testsuite/config-sub.data: Add test cases.
+
 2008-01-23  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Update URL for script location.
diff --git a/config.sub b/config.sub
index 6759825..cbd3d51 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2008-02-05'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -254,8 +254,9 @@ case $basic_machine in
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -335,8 +336,9 @@ case $basic_machine in
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 626f2d9..e715b83 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -121,3 +121,7 @@ parisc				hppa-unknown-linux-gnu
 tile				tile-unknown-linux-gnu
 tile64				tile-unknown-linux-gnu
 tile-linux			tile-unknown-linux-gnu
+mips64r5900-elf			mips64r5900-unknown-elf
+mips64r5900el-elf		mips64r5900el-unknown-elf
+mips64r5900			mips64r5900-unknown-elf
+mips64r5900el			mips64r5900el-unknown-elf