diff --git a/ChangeLog b/ChangeLog
index 47d19f53a..62c16684a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 20040407
  - (dtucker) [session.c] Flush stdout after displaying loginmsg.  From
    f_mohr at yahoo.de.
+ - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see
+   if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X)
+   are starting to restrict it as internal since it is not needed by
+   developers any more. (Patch based on Apple tree)
+ - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since 
+   krb5 on MacOS/X conflicts.  There may be a better solution, but this will 
+   work for now.
 
 20040406
  - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use
@@ -940,4 +947,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.3302 2004/04/06 22:04:09 dtucker Exp $
+$Id: ChangeLog,v 1.3303 2004/04/07 04:16:11 mouring Exp $
diff --git a/acconfig.h b/acconfig.h
index a1f4556f8..7e788b826 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.174 2004/04/06 11:31:13 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.175 2004/04/07 04:16:11 mouring Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -202,6 +202,9 @@
 /* Define if you don't want to use lastlog in session.c */
 #undef NO_SSH_LASTLOG
 
+/* Definite if have krb5_init_ets */
+#undef KRB5_INIT_ETS
+
 /* Define if you don't want to use utmp */
 #undef DISABLE_UTMP
 
diff --git a/auth-krb5.c b/auth-krb5.c
index 859492478..baa1a6317 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -54,7 +54,9 @@ krb5_init(void *context)
 		problem = krb5_init_context(&authctxt->krb5_ctx);
 		if (problem)
 			return (problem);
+#ifdef KRB5_INIT_ETS
 		krb5_init_ets(authctxt->krb5_ctx);
+#endif
 	}
 	return (0);
 }
diff --git a/configure.ac b/configure.ac
index a06452bd9..fa5021cfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.210 2004/04/06 11:41:51 dtucker Exp $
+# $Id: configure.ac,v 1.211 2004/04/07 04:16:11 mouring Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -2240,6 +2240,7 @@ AC_ARG_WITH(kerberos5,
 
 	LIBS="$LIBS $K5LIBS"
 	AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
+	AC_SEARCH_LIBS(krb5_init_ets, $K5LIBS, AC_DEFINE(KRB5_INIT_ETS))
 	]
 )
 
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 8ba3e7182..4e3598ead 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -65,7 +65,9 @@ ssh_gssapi_krb5_init()
 		logit("Cannot initialize krb5 context");
 		return 0;
 	}
+#ifdef KRB5_INIT_ETS
 	krb5_init_ets(krb_context);
+#endif
 
 	return 1;
 }
diff --git a/monitor.c b/monitor.c
index 30f7258a0..d44f92d59 100644
--- a/monitor.c
+++ b/monitor.c
@@ -33,11 +33,12 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
 #include <skey.h>
 #endif
 
+#include "zlib.h"  /* XXX Moved due to conflict on MacOS/X */
+
 #include "ssh.h"
 #include "auth.h"
 #include "kex.h"
 #include "dh.h"
-#include "zlib.h"
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"
diff --git a/monitor_wrap.c b/monitor_wrap.c
index b1b1c3a61..9e0417bdc 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -30,6 +30,8 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $");
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
+#include "zlib.h"  /* XXX Moved due to conflict on MacOS/X */
+
 #include "ssh.h"
 #include "dh.h"
 #include "kex.h"
@@ -40,7 +42,6 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $");
 #include "packet.h"
 #include "mac.h"
 #include "log.h"
-#include "zlib.h"
 #include "monitor.h"
 #include "monitor_wrap.h"
 #include "xmalloc.h"