diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d7317777f..76bf01dd2 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* libc/include/machine/ieeefp.h (__mt__): Renamed from __ms1__.
+	* libc/include/machine/setjmp.h (__mt__): Likewise.
+	* libc/machine/mt/setjmp.S: Rename ms1 reference to mt.
+	* libc/machine/configure.in: Ditto.
+
 2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* configure.host: Replace ms1 arch with mt arch.
diff --git a/newlib/libc/include/machine/ieeefp.h b/newlib/libc/include/machine/ieeefp.h
index 9da91332d..dcd6cdf3a 100644
--- a/newlib/libc/include/machine/ieeefp.h
+++ b/newlib/libc/include/machine/ieeefp.h
@@ -226,7 +226,7 @@
 #define __IEEE_BIG_ENDIAN
 #endif
 
-#ifdef __ms1__
+#ifdef __mt__
 #define __IEEE_BIG_ENDIAN
 #endif
 
diff --git a/newlib/libc/include/machine/setjmp.h b/newlib/libc/include/machine/setjmp.h
index f38123aba..b74808f9c 100644
--- a/newlib/libc/include/machine/setjmp.h
+++ b/newlib/libc/include/machine/setjmp.h
@@ -200,7 +200,7 @@ _BEGIN_STD_C
 #define _JBTYPE unsigned long
 #endif
 
-#ifdef __ms1__
+#ifdef __mt__
 #define _JBLEN 16
 #endif
 
diff --git a/newlib/libc/machine/mt/configure.in b/newlib/libc/machine/mt/configure.in
index b64b97569..d6898f515 100644
--- a/newlib/libc/machine/mt/configure.in
+++ b/newlib/libc/machine/mt/configure.in
@@ -1,4 +1,4 @@
-dnl This is the newlib/libc/machine/ms1 configure.in file.
+dnl This is the newlib/libc/machine/mt configure.in file.
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.5)
diff --git a/newlib/libc/machine/mt/setjmp.S b/newlib/libc/machine/mt/setjmp.S
index 1f95c6789..e93bd3313 100644
--- a/newlib/libc/machine/mt/setjmp.S
+++ b/newlib/libc/machine/mt/setjmp.S
@@ -1,4 +1,4 @@
-# setjmp/longjmp for ms1.
+# setjmp/longjmp for mt.
 # 
 # The jmpbuf looks like this:
 #