diff --git a/ChangeLog b/ChangeLog
index 407262c..2a24c09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-09  Ben Elliston  <bje@gnu.org>
+
+	Reported by Jan-Benedict Glaw <jbglaw@lug-owl.de>:
+	* config.guess (vax:Linux:*:): Detect as vax-dec-linux-gnu.
+	* testsuite/config-guess.data: Add test.
+
+2005-12-09  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* config.sub (mt): Rename from ms1.
+	(ms1): Alias it to mt for backward compatibility.
+	* testsuite/config-sub.data: Update testsuite.
+
 2005-11-13  Kean Johnston  <jkj@sco.com>
 
 	* config.sub: Allow -sco6 and -sco5v6 to be aliases for SCO
diff --git a/config.guess b/config.guess
index 52c01be..a8f2927 100755
--- a/config.guess
+++ b/config.guess
@@ -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-11'
+timestamp='2005-12-09'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -919,6 +919,9 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
diff --git a/config.sub b/config.sub
index a4aba16..59e7208 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-09'
 
 # 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 \
@@ -294,6 +294,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
@@ -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/testsuite/config-guess.data b/testsuite/config-guess.data
index 34523cf..3b6b62c 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -14,3 +14,4 @@ or32	ignored			Linux		ignored	or32-unknown-linux-gnu
 x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
 x86	5.0			Interix		ignored	i586-pc-interix5
 ppc64	2.6.9-22		Linux		ignored	powerpc64-unknown-linux-gnu
+vax	2.6.15			Linux		ignored	vax-dec-linux-gnu
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 12de63b..71d8979 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -39,8 +39,8 @@ arm-unknown-riscos		arm-unknown-riscos
 i586-skyos			i586-pc-skyos
 m32c				m32c-unknown-none
 m32c-elf			m32c-unknown-elf
-ms1				ms1-unknown-none
-ms1-elf				ms1-unknown-elf
+ms1				mt-unknown-none
+ms1-elf				mt-unknown-elf
 mips64vr5900-elf		mips64vr5900-unknown-elf
 mips64vr5900el-elf		mips64vr5900el-unknown-elf
 mips64vr5900			mips64vr5900-unknown-elf
@@ -72,3 +72,5 @@ sparc-haiku			sparc-unknown-haiku
 powerpc-haiku			powerpc-unknown-haiku
 i386-pc-sco6			i386-pc-sco5v6
 i386-pc-sco5v6			i386-pc-sco5v6
+mt				mt-unknown-none
+mt-elf				mt-unknown-elf