diff --git a/ChangeLog b/ChangeLog
index eaefbea..c2e8d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-23  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Detect NonStop-UX on Compaq MIPS machines.
+	* config.sub: Handle aliases for mips-compaq-nonstopux.
+	From Tom Bates <tom.bates@compaq.com>.
+
 2000-10-12  Ben Elliston  <bje@redhat.com>
 
 	* config.guess: Detect GNU/Linux on HP PA-RISC systems.
diff --git a/config.guess b/config.guess
index 3b095eb..6944d13 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-version='2000-10-12'
+version='2000-10-23'
 
 # 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
@@ -1100,6 +1100,9 @@ EOF
     NSR-[KW]:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit 0 ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
 	exit 0 ;;
diff --git a/config.sub b/config.sub
index 66f8e2d..8418882 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-version='2000-10-09'
+version='2000-10-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -640,6 +640,10 @@ case $basic_machine in
 		basic_machine=i960-intel
 		os=-mon960
 		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
 	np1)
 		basic_machine=np1-gould
 		;;
@@ -991,7 +995,7 @@ case $os in
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32*)
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)