--- cyrus-imapd-2.3.7/imap/version.c.krb4	2005-02-16 22:06:19.000000000 +0100
+++ cyrus-imapd-2.3.7/imap/version.c	2007-01-22 15:36:27.000000000 +0100
@@ -169,7 +169,7 @@
 	     "; lock = %s", lock_method_desc);
     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
 	     "; nonblock = %s", nonblock_method_desc);
-#ifdef HAVE_KRB
+#if 0
     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
 	     " (%s)", krb4_version);
 #endif

--- cyrus-imapd-2.3.7/imap/pop3d.c.krb4	2007-01-22 15:41:14.000000000 +0100
+++ cyrus-imapd-2.3.7/imap/pop3d.c	2007-01-22 15:41:15.000000000 +0100
@@ -88,8 +88,6 @@
 #include "statuscache.h"
 
 #ifdef HAVE_KRB
-/* kerberos des is purported to conflict with OpenSSL DES */
-#define DES_DEFS
 #include <krb.h>
 
 /* MIT's kpop authentication kludge */