diff --git a/ChangeLog b/ChangeLog
index 2ff7c3f..4a9e325 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-10  Dmitriy Fedchenko <xfedch@gmail.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.guess (NSE-?:NONSTOP_KERNEL:*:*): Match NSE-* as the
+	substring can be longer than one character.
+	* testsuite/config-guess.data: Add a new test case.
+
 2012-05-24  Joe Seymour  <jseymour@codesourcery.com>
 
 	* config.sub (hexagon): Set default operating system to elf.
diff --git a/config.guess b/config.guess
index d622a44..c0adba9 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-06-10'
 
 # 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
@@ -1256,7 +1256,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 3c76e65..aac8341 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -34,6 +34,7 @@ macppc	1.0			MirBSD		ignored	powerpc-unknown-mirbsd1.0
 NEO-1	1.0			NONSTOP_KERNEL	ignored	neo-tandem-nsk1.0
 NSE-1	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
 NSE-N	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
+NSE-NN	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
 or32	ignored			Linux		ignored	or32-unknown-linux-gnu
 padre	2.6.15			Linux		ignored	sparc-unknown-linux-gnu
 pc	1.0			ignored		ignored	i586-pc-msdosdjgpp