diff --git a/ChangeLog b/ChangeLog
index d567071..27fa502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-02  Aldy Hernandez  <aldyh@redhat.com>
+
+	* config.sub (ms1, ms1-*): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2005-06-02  Jim Blandy  <jimb@redhat.com>
 
 	* config.sub (m32c, m32c-*): New.
diff --git a/config.sub b/config.sub
index ce281e3..8b2c57a 100755
--- a/config.sub
+++ b/config.sub
@@ -256,6 +256,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
 	| openrisc | or32 \
@@ -333,6 +334,7 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 52a4fc0..d7d3241 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -37,5 +37,7 @@ bfin				bfin-unknown-none
 arm-riscos			arm-unknown-riscos
 arm-unknown-riscos		arm-unknown-riscos
 i586-skyos			i586-pc-skyos
-m32c-elf			m32c-unknown-elf
 m32c				m32c-unknown-none
+m32c-elf			m32c-unknown-elf
+ms1				ms1-unknown-none
+ms1-elf				ms1-unknown-elf