diff --git a/ChangeLog b/ChangeLog
index a340a433e..c4f797743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20010611
  - (bal) NeXT/MacOS X lack libgen.h and dirname().  Patch by Mark Miller 
    <markm@swoon.net> 
+ - (bal) Handle broken krb4 issues on Solaris with multiple defined u_*_t
+   types.  Patch by Jan IVEN <Jan.Iven@cern.ch> 
 
 20010610
  - (bal) Missed two files in major resync.  auth-bsdauth.c and auth-skey.c
@@ -5599,4 +5601,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1274 2001/06/10 17:24:51 mouring Exp $
+$Id: ChangeLog,v 1.1275 2001/06/10 17:35:45 mouring Exp $
diff --git a/defines.h b/defines.h
index 42a661a39..8a3d08c98 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.65 2001/05/17 03:40:05 mouring Exp $ */
+/* $Id: defines.h,v 1.66 2001/06/10 17:35:46 mouring Exp $ */
 
 /* Some platforms need this for the _r() functions */
 #if !defined(_REENTRANT) && !defined(SNI)
@@ -199,6 +199,7 @@ typedef unsigned long  u_int32_t;
 #   endif
 #  endif
 # endif
+#define __BIT_TYPES_DEFINED__
 #endif
 
 /* 64-bit types */