--- amanda-2.6.0/config/amanda/krb5-security.m4~	2008-01-18 01:31:33.000000000 +0100
+++ amanda-2.6.0/config/amanda/krb5-security.m4	2008-05-13 11:41:28.000000000 +0200
@@ -69,6 +69,8 @@
                 AMANDA_ADD_LIBS([-lgssapi_krb5 -lkrb5 $K5CRYPTO $K5SUPPORT -lcom_err])
                 break
             elif test \( -f ${k5libdir}/libkrb5.a -o -f ${k5libdir}/libkrb5.so \) -a \( -f ${k5libdir}/libasn1.a -o -f ${k5libdir}/libasn1.so \) -a \( -f ${k5libdir}/libgssapi.a -o -f ${k5libdir}/libgssapi.so \); then
+                KRB5_DIR_FOUND=$dir
+                KRB5_LIBDIR_FOUND=$k5libdir
                 AMANDA_ADD_LIBS([-lgssapi -lkrb5 -lasn1])
                 AMANDA_ADD_CPPFLAGS([-DKRB5_HEIMDAL_INCLUDES])
                 break
--- amanda-2.6.0/common-src/krb5-security.c~	2008-01-18 01:31:41.000000000 +0100
+++ amanda-2.6.0/common-src/krb5-security.c	2008-05-13 11:50:57.000000000 +0200
@@ -45,7 +45,7 @@
 #include "sockaddr-util.h"
 
 #ifdef KRB5_HEIMDAL_INCLUDES
-#include "com_err.h"
+#include "et/com_err.h"
 #endif
 
 #define BROKEN_MEMORY_CCACHE
@@ -67,7 +67,7 @@
 #ifndef KRB5_HEIMDAL_INCLUDES
 #include <gssapi/gssapi_generic.h>
 #else
-#include <gssapi/gssapi.h>
+#include <gssapi.h>
 #endif
 #include <krb5.h>
 
--- amanda-2.6.0/common-src/security-util.h~	2008-01-18 01:31:41.000000000 +0100
+++ amanda-2.6.0/common-src/security-util.h	2008-05-13 11:51:10.000000000 +0200
@@ -51,7 +51,7 @@
 #  ifndef KRB5_HEIMDAL_INCLUDES
 #    include <gssapi/gssapi_generic.h>
 #  else
-#    include <gssapi/gssapi.h>
+#    include <gssapi.h>
 #  endif
 #  include <krb5.h>
 #endif
--- amanda-2.6.1p1/common-src/security-util.h~	2009-12-09 15:20:43.091037399 +0100
+++ amanda-2.6.1p1/common-src/security-util.h	2009-12-09 15:21:33.612974357 +0100
@@ -47,10 +47,10 @@
 
 
 #ifdef KRB5_SECURITY
-#  define KRB5_DEPRECATED 1
 #  ifndef KRB5_HEIMDAL_INCLUDES
+#    define KRB5_DEPRECATED 1
 #    include <gssapi/gssapi_generic.h>
 #  else
 #    include <gssapi.h>
 #  endif
 #  include <krb5.h>