diff --git a/ChangeLog b/ChangeLog
index 0cc935b..6de82e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-05  Ben Elliston  <bje@wasabisystems.com>
+	    Joachim Schmitz  <schmitz@hp.com>
+
+	* config.guess: Handle NSR-? to accept any CPU type.
+
 2004-01-05  Ben Elliston  <bje@wasabisystems.com>
 
 	* config.sub: Handle amd64-*.
diff --git a/config.guess b/config.guess
index 61f2e4c..e8c6fc0 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 Free Software Foundation, Inc.
 
-timestamp='2003-10-20'
+timestamp='2004-01-05'
 
 # 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
@@ -1186,7 +1186,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)