diff --git a/ChangeLog b/ChangeLog
index eefae01..82f2ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-05-01  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-sub.data: Add test cases for mipsisa*r6.
+
+2014-05-01  Chao-ying Fu  <chao-ying.fu@imgtec.com>
+	    Matthew Fortune  <matthew.fortune@imgtec.com>
+	    Andrew Bennett  <andrew.bennett@imgtec.com>
+
+	* config.sub (mipsisa32r6, mipsisa64r6): New.
+
 2014-04-03  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-sub.data: Sort.
diff --git a/config.sub b/config.sub
index 6acbfac..d654d03 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-04-03'
+timestamp='2014-05-01'
 
 # 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
@@ -283,8 +283,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -401,8 +403,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 44e8618..e8e7c19 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -132,6 +132,10 @@ mips64vr5900el-elf		mips64vr5900el-unknown-elf
 mips64vr5900-elf		mips64vr5900-unknown-elf
 mips64vr5900el			mips64vr5900el-unknown-elf
 mips64vr5900			mips64vr5900-unknown-elf
+mipsisa32r6-elf			mipsisa32r6-unknown-elf
+mipsisa32r6el-elf		mipsisa32r6el-unknown-elf
+mipsisa64r6-elf			mipsisa64r6-unknown-elf
+mipsisa64r6el-elf		mipsisa64r6el-unknown-elf
 mipsr5900el			mipsr5900el-unknown-elf
 mipsr5900			mipsr5900-unknown-elf
 mips-sde-elf			mips-sde-elf