diff --git a/ChangeLog b/ChangeLog
index cd48ba423..53043c4ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040102
+ - (djm) OSX/Darwin needs BIND_8_COMPAT to build getrrsetbyname. Report from
+   jakob@
+
 20031231
  - (dtucker) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2003/12/22 09:16:58
@@ -1637,4 +1641,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.3158 2003/12/31 03:59:17 dtucker Exp $
+$Id: ChangeLog,v 1.3159 2004/01/02 06:52:10 djm Exp $
diff --git a/configure.ac b/configure.ac
index 5ac6acb38..bb7e59be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.179 2003/12/31 03:59:17 dtucker Exp $
+# $Id: configure.ac,v 1.180 2004/01/02 06:52:10 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -150,6 +150,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
 	AC_DEFINE(SETEUID_BREAKS_SETUID)
 	AC_DEFINE(BROKEN_SETREUID)
 	AC_DEFINE(BROKEN_SETREGID)
+	AC_DEFINE_UNQUOTED(BIND_8_COMPAT, 1)
 	;;
 *-*-hpux10.26)
 	if test -z "$GCC"; then