diff --git a/ChangeLog b/ChangeLog
index 26940bd79ad..6d759c2980a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.sub: Replace ms1 with mt.  Allow ms1 as an alias.
+
 2005-12-06  Adam Nemet  <anemet@caviumnetworks.com>
 
 	* MAINTAINERS: Change email address.
diff --git a/config.sub b/config.sub
index a4aba165da3..eb6b3eb89ce 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-11-13'
+timestamp='2005-12-06'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -265,7 +265,7 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
 	| ns16k | ns32k \
 	| or32 \
@@ -295,6 +295,9 @@ case $basic_machine in
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 
+        ms1)
+	    basic_machine=mt-unknown
+	    ;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -344,7 +347,7 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -704,6 +707,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+	        basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1ec497a184c..8f321894d6e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.gcc (ms1): Replace with ...
+	(mt): ... this.
+	* config/ms1: Rename to ...
+	* config/mt: ... here.  Rename ms1 files to mt.
+	* config/mt/mt.c: Adjust gt-mt.h #include.
+	* config/mt/t-mt (LIB1ASMSRCS, LIB2FUNCS_EXTRA): Adjust.
+	(crti.o, crtn.o): Adjust file names.
+
 2005-12-12  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* varray.h: Allow compilation with a C++ compiler.
diff --git a/gcc/config/mt/mt.c b/gcc/config/mt/mt.c
index 3695f0fb8b4..74a77e82ec5 100644
--- a/gcc/config/mt/mt.c
+++ b/gcc/config/mt/mt.c
@@ -2495,4 +2495,4 @@ const struct attribute_spec ms1_attribute_table[];
 
 struct gcc_target targetm = TARGET_INITIALIZER;
 
-#include "gt-ms1.h"
+#include "gt-mt.h"
diff --git a/gcc/config/mt/t-mt b/gcc/config/mt/t-mt
index 3093fc445db..5e400eb7b7a 100644
--- a/gcc/config/mt/t-mt
+++ b/gcc/config/mt/t-mt
@@ -25,10 +25,10 @@ CROSS_LIBGCC1 =
 # Alternatively if assembler functions *are* needed then define the
 # entries below:
 # CROSS_LIBGCC1 = libgcc1-asm.a
-# LIB1ASMSRC    = ms1/lib1funcs.asm
+# LIB1ASMSRC    = mt/lib1funcs.asm
 # LIB1ASMFUNCS  = _udivsi3 etc...
 
-LIB2FUNCS_EXTRA = $(srcdir)/config/ms1/lib2extra-funcs.c
+LIB2FUNCS_EXTRA = $(srcdir)/config/mt/lib2extra-funcs.c
 
 # If any special flags are necessary when building libgcc2 put them here.
 #
@@ -49,11 +49,11 @@ dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
 
 # Assemble startup files.
-crti.o: $(srcdir)/config/ms1/crti.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) -c -o crti.o -x assembler $(srcdir)/config/ms1/crti.asm
+crti.o: $(srcdir)/config/mt/crti.asm $(GCC_PASSES)
+	$(GCC_FOR_TARGET) -c -o crti.o -x assembler $(srcdir)/config/mt/crti.asm
  
-crtn.o: $(srcdir)/config/ms1/crtn.asm $(GCC_PASSES)
-	$(GCC_FOR_TARGET) -c -o crtn.o -x assembler $(srcdir)/config/ms1/crtn.asm
+crtn.o: $(srcdir)/config/mt/crtn.asm $(GCC_PASSES)
+	$(GCC_FOR_TARGET) -c -o crtn.o -x assembler $(srcdir)/config/mt/crtn.asm
 
 # Enable the following if multilibs are needed.
 # See gcc/genmultilib, gcc/gcc.texi and gcc/tm.texi for a