diff --git a/ChangeLog b/ChangeLog
index 051418fdb..6d2518614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
  - (djm) [auth-krb5.c auth.h session.c] Explicitly refer to Kerberos ccache 
    file using FILE: method, fixes problems on Mac OSX.
    Patch from simon@sxw.org.uk; ok dtucker@
+ - (tim) [configure.ac] Set SETEUID_BREAKS_SETUID, BROKEN_SETREUID and
+   BROKEN_SETREGID for SCO OpenServer 3
 
 20040412
  - (dtucker) [sshd_config.5] Add PermitRootLogin without-password warning
@@ -973,4 +975,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.3313 2004/04/16 12:47:55 djm Exp $
+$Id: ChangeLog,v 1.3314 2004/04/17 03:03:07 tim Exp $
diff --git a/configure.ac b/configure.ac
index 9d24f37ac..6ba4d244a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.213 2004/04/14 10:14:26 djm Exp $
+# $Id: configure.ac,v 1.214 2004/04/17 03:03:07 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -359,6 +359,9 @@ mips-sony-bsd|mips-sony-newsos4)
 	AC_DEFINE(HAVE_SECUREWARE)
 	AC_DEFINE(DISABLE_SHADOW)
 	AC_DEFINE(BROKEN_SAVED_UIDS)
+	AC_DEFINE(SETEUID_BREAKS_SETUID)
+	AC_DEFINE(BROKEN_SETREUID)
+	AC_DEFINE(BROKEN_SETREGID)
 	AC_DEFINE(WITH_ABBREV_NO_TTY)
 	AC_CHECK_FUNCS(getluid setluid)
 	MANTYPE=man