diff --git a/ChangeLog b/ChangeLog
index 476310bc3..a865fce6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20050423
+ - (tim) [config.guess] Add support for OpenServer 6.
+
 20050421
  - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if
    UseLogin is set as PAM is not used to establish credentials in that
@@ -2441,4 +2444,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3745 2005/04/21 09:50:55 dtucker Exp $
+$Id: ChangeLog,v 1.3746 2005/04/24 01:17:29 tim Exp $
diff --git a/config.guess b/config.guess
index 500ee74b0..5adbef1f9 100755
--- a/config.guess
+++ b/config.guess
@@ -995,7 +995,8 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i*86:*:5:[78]*)
+    i*86:*:5:[678]*)
+	# Unixware 7.x, OpenUNIX 8, & OpenServer 6
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;