diff --git a/ChangeLog b/ChangeLog
index 7cdcbf091..922b2c649 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20060904
+ - (dtucker) [configure.ac] Define BROKEN_UPDWTMP on SCO OSR6 as the native
+   updwdtmp seems to generate invalid wtmp entries.  From Roger Cornelius,
+   ok djm@
+
 20060903
  - (dtucker) [configure.ac openbsd-compat/openbsd-compat.h] Check for
    declaration of writev(2) and declare it ourselves if necessary.  Makes
@@ -5390,4 +5395,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.4528 2006/09/03 12:44:49 dtucker Exp $
+$Id: ChangeLog,v 1.4529 2006/09/04 12:37:41 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index cdabbd8a1..32ecd0da8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.358 2006/09/03 12:44:49 dtucker Exp $
+# $Id: configure.ac,v 1.359 2006/09/04 12:37:42 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.358 $)
+AC_REVISION($Revision: 1.359 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -512,6 +512,8 @@ mips-sony-bsd|mips-sony-newsos4)
 		TEST_SHELL=/u95/bin/sh
 		AC_DEFINE(BROKEN_LIBIAF, 1,
 			[ia_uinfo routines not supported by OS yet])
+		AC_DEFINES(BROKEN_UPDWTMP, 1,
+			[using updwtmp will corrupt wtmp entries])
 		;;
 	*)	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
 		;;