diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 69509f90a..80e7f7680 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* mt/16-002.ld: Change architecture to 'mt'.  Remove
+	SEARCH_DIR.
+	* mt/16-003.ld: Likewise.
+	* mt/64-001.ld: Likewise.
+	* mt/Makefile.in: Change comment to reference 'mt' rather than 'ms1'.
+	* mt/crt0.S: Likewise.
+
 2005-12-12  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* configure.in: Replace ms1 arch with mt arch.
diff --git a/libgloss/mt/16-002.ld b/libgloss/mt/16-002.ld
index 65efb8578..9dfd62eff 100644
--- a/libgloss/mt/16-002.ld
+++ b/libgloss/mt/16-002.ld
@@ -1,7 +1,7 @@
-OUTPUT_FORMAT("elf32-ms1", "elf32-ms1", "elf32-ms1")
-OUTPUT_ARCH(ms1)
+OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
+OUTPUT_ARCH(mt)
 ENTRY(__boot_start)
-SEARCH_DIR(/usr/local/mrisc1-elf/lib)
+
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 MEMORY
diff --git a/libgloss/mt/16-003.ld b/libgloss/mt/16-003.ld
index 9da0fe556..c837b7540 100644
--- a/libgloss/mt/16-003.ld
+++ b/libgloss/mt/16-003.ld
@@ -1,7 +1,7 @@
-OUTPUT_FORMAT("elf32-ms1", "elf32-ms1", "elf32-ms1")
-OUTPUT_ARCH(ms1)
+OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
+OUTPUT_ARCH(mt)
 ENTRY(__boot_start)
-SEARCH_DIR(/usr/local/mrisc1-elf/lib)
+
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 MEMORY
diff --git a/libgloss/mt/64-001.ld b/libgloss/mt/64-001.ld
index f8a8ca054..501ec32f8 100644
--- a/libgloss/mt/64-001.ld
+++ b/libgloss/mt/64-001.ld
@@ -1,7 +1,7 @@
-OUTPUT_FORMAT("elf32-ms1", "elf32-ms1", "elf32-ms1")
-OUTPUT_ARCH(ms1)
+OUTPUT_FORMAT("elf32-mt", "elf32-mt", "elf32-mt")
+OUTPUT_ARCH(mt)
 ENTRY(__boot_start)
-SEARCH_DIR(/usr/local/mrisc1-elf/lib);
+
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 MEMORY
diff --git a/libgloss/mt/Makefile.in b/libgloss/mt/Makefile.in
index e2fd1f838..d8d9fa182 100644
--- a/libgloss/mt/Makefile.in
+++ b/libgloss/mt/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2001 Red Hat, Inc.
+# Copyright (c) 2001, 2005 Red Hat, Inc.
 #
 # The authors hereby grant permission to use, copy, modify, distribute,
 # and license this software and its documentation for any purpose, provided
@@ -10,7 +10,7 @@
 # the new terms are clearly indicated on the first page of each file where
 # they apply.
 
-# Makefile for libgloss/ms1. This is the board support for the Morpho ms1.
+# Makefile for libgloss/mt. This is the board support for the Morpho mt.
 
 VPATH = @srcdir@ @srcdir@/..
 srcdir = @srcdir@
diff --git a/libgloss/mt/crt0.S b/libgloss/mt/crt0.S
index 276124f5c..ba5249e01 100644
--- a/libgloss/mt/crt0.S
+++ b/libgloss/mt/crt0.S
@@ -1,4 +1,4 @@
-# Startup Code for the Morpho ms1
+# Startup Code for the Morpho mt
 
 # Create a label for the start of the eh_frame section.
 	.section .eh_frame