diff --git a/ChangeLog b/ChangeLog
index bb538bb..ca43cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-09  Olli Savia  <ops@iki.fi>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Add detection for LynxOS 4.2.
+	* testsuite/config-guess.data: Add a test case.
+
 2009-06-09  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (*:NetBSD:*:*): Use grep -q, which is supported on
diff --git a/config.guess b/config.guess
index 4ab4c62..e3a2116 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-06-07'
+timestamp='2009-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
@@ -1046,7 +1046,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1154,7 +1154,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index a4ad01e..7f6f214 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -43,3 +43,5 @@ i386	12.1			AROS		ignored	i386-pc-aros
 pc	1.0			ignored		ignored	i586-pc-msdosdjgpp
 s390x	5.6			SunOS		ignored	s390x-ibm-solaris2.6
 8664	1.0			Windows_NT	ignored	x86_64-pc-mks
+i386	4.2			LynxOS		ignored	i386-unknown-lynxos4.2
+PowerPC	4.2			LynxOS		ignored	powerpc-unknown-lynxos4.2