diff --git a/ChangeLog b/ChangeLog
index 5d3c89c..43fc695 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-09  Ben Elliston  <bje@wasabisystems.com>
+
+	* config.guess (SHG2:*:4.0:3.0): Handle NCR System V UNIX machine.
+	Reported by Raj Mannar <rajman@ureach.com>.
+
 2003-05-09  Andreas Jaeger  <aj@suse.de>
 
 	* config.sub (maybe_os): Add alias amd64 for x86_64.
diff --git a/config.guess b/config.guess
index b1b3974..6bdac8d 100755
--- a/config.guess
+++ b/config.guess
@@ -1033,7 +1033,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`