diff --git a/ChangeLog b/ChangeLog
index a024713..39b611a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-02-07  Ben Elliston  <bje@gnu.org>
+
+	Reported by Hugues Lefebvre <hugues.lefebvre@lusis.fr>.
+	* config.guess (NSX-?:NONSTOP_KERNEL:*:*): New.
+	* config.sub (nsx-tandem): New.
+	* testsuite/config-guess.data: Add a test case.
+	* testsuite/config-sub.data: Likewise.
+
 2017-01-01  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Update copyright years.
diff --git a/config.guess b/config.guess
index bbd48b6..1000e2b 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-01-01'
+timestamp='2017-02-07'
 
 # 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
@@ -1343,6 +1343,9 @@ EOF
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
+    NSX-?:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;
diff --git a/config.sub b/config.sub
index 7e792b4..87abeab 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-01-01'
+timestamp='2017-02-07'
 
 # 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
@@ -948,6 +948,9 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 0d0ce55..bb97775 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -58,6 +58,7 @@ NEO-1		 1.0			 NONSTOP_KERNEL		 ignored	 ignored	 neo-tandem-nsk1.0
 NSE-1		 1.0			 NONSTOP_KERNEL		 ignored	 ignored	 nse-tandem-nsk1.0
 NSE-N		 1.0			 NONSTOP_KERNEL		 ignored	 ignored	 nse-tandem-nsk1.0
 NSE-NN		 1.0			 NONSTOP_KERNEL		 ignored	 ignored	 nse-tandem-nsk1.0
+NSX-H		 L16			 NONSTOP_KERNEL		 05		 ignored	 nsx-tandem-nskL16
 openrisc	 ignored		 Linux			 ignored	 ignored	 or1k-unknown-linux-gnu
 or1k		 ignored		 Linux			 ignored	 ignored	 or1k-unknown-linux-gnu
 or1knd		 ignored		 Linux			 ignored	 ignored	 or1knd-unknown-linux-gnu
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 85c1f35..d4ef23a 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -317,6 +317,7 @@ nios-elf					nios-unknown-elf
 nios						nios-unknown-none
 ns16k						ns16k-unknown-none
 ns32k						ns32k-unknown-none
+nsx-tandem-nsk					nsx-tandem-nsk
 nvptx						nvptx-unknown-none
 open8-elf					open8-unknown-elf
 open8						open8-unknown-none