--- driver.c.orig	Thu Mar  5 23:16:28 1998
+++ driver.c	Mon Mar 16 03:20:15 1998
@@ -54,6 +54,11 @@
 #include <krb.h>
 #define krb_get_err_text(e) (krb_err_txt[e])
 #else
+#if defined(__NetBSD__)
+#define krb_get_err_text(e) (krb_err_txt[e])
+#include <kerberosIV/krb.h>
+#include <kerberosIV/des.h>
+#else
 #if defined(__FreeBSD__) || defined(__linux__)
 #define krb_get_err_text(e) (krb_err_txt[e])
 #include <krb.h>
@@ -62,6 +67,7 @@
 #include <krb.h>
 #include <des.h>
 #endif /* ! defined (__FreeBSD__) */
+#endif /* ! defined (__NetBSD__) */
 #endif /* ! defined (__bsdi__) */
 #include <netinet/in.h>
 #include <netdb.h>
@@ -1594,7 +1600,7 @@
 kerberos_auth (socket, canonical) 
 /* authenticate to the server host using Kerberos V4 */
 int socket;		/* socket to server host */
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 char *canonical;	/* server name */
 #else
 const char *canonical;	/* server name */
--- imap.c.orig	Tue Mar  3 16:34:02 1998
+++ imap.c	Mon Mar 16 03:15:37 1998
@@ -18,12 +18,18 @@
 #ifdef KERBEROS_V4
 #if defined (__bsdi__)
 #include <des.h>
+#include <krb.h>
 #define krb_get_err_text(e) (krb_err_txt[e])
 #endif
+#if defined (__NetBSD__)
+#define krb_get_err_text(e) (krb_err_txt[e])
+#include <kerberosIV/krb.h>
+#else
 #if defined (__FreeBSD__) || defined(__linux__)
 #define krb_get_err_text(e) (krb_err_txt[e])
-#endif
 #include <krb.h>
+#endif
+#endif
 #endif /* KERBEROS_V4 */
 
 #ifdef GSSAPI