diff --git a/ChangeLog b/ChangeLog
index 06e61e9e4..df175c219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
    builds.  Portability corrections from tim@.
  - (dtucker) [configure.ac] Bug #655: uid swapping issues on Mac OS X.
    Patch from max at quendi.de.
+ - (dtucker) [configure.ac] Bug #657: uid swappping issues on BSDi.
 
 20030919
  - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1139,4 +1140,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.3011 2003/09/22 01:07:40 dtucker Exp $
+$Id: ChangeLog,v 1.3012 2003/09/22 01:18:47 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 538ecd2d9..5d1f85012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.157 2003/09/22 01:07:40 dtucker Exp $
+# $Id: configure.ac,v 1.158 2003/09/22 01:18:47 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -230,6 +230,11 @@ mips-sony-bsd|mips-sony-newsos4)
 *-*-freebsd*)
 	check_for_libcrypt_later=1
 	;;
+*-*-bsdi*)
+	AC_DEFINE(SETEUID_BREAKS_SETUID)
+	AC_DEFINE(BROKEN_SETREUID)
+	AC_DEFINE(BROKEN_SETREGID)
+	;;
 *-next-*)
 	conf_lastlog_location="/usr/adm/lastlog"
 	conf_utmp_location=/etc/utmp