diff -udNr yafc-1.1.1/cf/kerberos.m4 yafc-1.1.1-r1/cf/kerberos.m4
--- yafc-1.1.1/cf/kerberos.m4	2002-12-05 17:10:55.000000000 -0500
+++ yafc-1.1.1-r1/cf/kerberos.m4	2005-11-20 02:26:35.000000000 -0500
@@ -285,6 +285,10 @@
           [
 #include <gssapi/gssapi.h>
           ])
+		AC_CHECK_HEADERS([gssapi/krb5_err.h],,,
+		  [
+#include <gssapi/krb5_err.h>
+		  ])
       fi
     fi
     if test "$yafc_found_gssapi_inc" = "yes"; then
diff -udNr yafc-1.1.1/lib/gssapi.c yafc-1.1.1-r1/lib/gssapi.c
--- yafc-1.1.1/lib/gssapi.c	2005-11-20 02:30:15.375703984 -0500
+++ yafc-1.1.1-r1/lib/gssapi.c	2005-11-20 02:29:43.000000000 -0500
@@ -51,6 +51,12 @@
 # if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
 #   include <gssapi/gssapi_krb5.h>
 # endif
+ /* This is needed in Gentoo's Heimdal install which correctly creates
+  * symlinks to match MIT's distribution locations for gssapi/*.h
+  */
+# if defined(HAVE_GSSAPI_KRB5_ERR_H)
+#   include <gssapi/krb5_err.h>
+# endif
 #else
 # error "Need gssapi.h from either Heimdal or MIT krb5"
 #endif