diff --git a/ChangeLog b/ChangeLog
index 6057cc8f8..dace988b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
  - (dtucker) [configure.ac] Bug #653: uid swapping issues on Tru64.
  - (dtucker) [configure.ac] Bug #693: uid swapping issues on NCR MP-RAS.
    Patch from david.haughton at ncr.com
+ - (dtucker) [configure.ac] Bug #659: uid swapping issues on IRIX 6.
+   Part of patch supplied by bugzilla-openssh at thewrittenword.com
 
 20030919
  - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1143,4 +1145,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3014 2003/09/22 01:40:24 dtucker Exp $
+$Id: ChangeLog,v 1.3015 2003/09/22 01:58:21 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 3a503d994..b602e915b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.160 2003/09/22 01:40:25 dtucker Exp $
+# $Id: configure.ac,v 1.161 2003/09/22 01:58:21 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -201,6 +201,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	AC_DEFINE(WITH_IRIX_AUDIT)
 	AC_CHECK_FUNC(jlimit_startjob, [AC_DEFINE(WITH_IRIX_JOBS)])
 	AC_DEFINE(BROKEN_INET_NTOA)
+	AC_DEFINE(SETEUID_BREAKS_SETUID)
+	AC_DEFINE(BROKEN_SETREUID)
+	AC_DEFINE(BROKEN_SETREGID)
 	AC_DEFINE(WITH_ABBREV_NO_TTY)
 	AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
 	;;