diff --git a/ChangeLog b/ChangeLog
index 25fd7a9..cae8132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-11  Masaki Muranaka  <monaka@monami-software.com>
+
+	* config.sub: Accept cr16-*-elf.
+	* testsuite/config-sub.data: Add test cases.
+
 2010-09-24  Ben Elliston  <bje@gnu.org>
 
 	From Joachim Schmitz <schmitz@hp.com>:
diff --git a/config.sub b/config.sub
index 320e303..4fb98e1 100755
--- a/config.sub
+++ b/config.sub
@@ -539,7 +539,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 6022347..cf2eefb 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -202,3 +202,5 @@ nds32				nds32-unknown-none
 nds32le				nds32le-unknown-none
 nds32-elf			nds32-unknown-elf
 nds32le-elf			nds32le-unknown-elf
+cr16-elf			cr16-unknown-elf
+cr16-random-elf			cr16-unknown-elf