diff --git a/ChangeLog b/ChangeLog
index 9abdfa7..8cb0319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-20  Ben Elliston  <bje@redhat.com>
+
+	* config.guess: Detect the NonStop Kernel on Tandem
+	machines. Suggested by Kelly F. Hickel <kfh@mqsoftware.com>.
+	* config.sub: Handle nsr-tandem and -nsk aliases.
+
 2000-02-29  Peter van der Veen  <peterv@qnx.com>
 
 	* config.guess: Add support for QNX Neutrino.
diff --git a/config.guess b/config.guess
index ae17451..51189c5 100755
--- a/config.guess
+++ b/config.guess
@@ -1033,6 +1033,9 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
+    NSR-W:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index 38171f5..db00445 100755
--- a/config.sub
+++ b/config.sub
@@ -595,6 +595,9 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -993,6 +996,9 @@ case $os in
 	-ns2 )
 	        os=-nextstep2
 		;;
+	-nsk)
+		os=-nsk
+		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`