diff --git a/config.h.in b/config.h.in
index 285e720dcb..8b51cf5c8f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.106.40.16 2010/06/03 02:35:53 marka Exp $ */
+/* $Id: config.h.in,v 1.106.40.17 2010/06/03 03:56:41 marka Exp $ */
 
 /*! \file */
 
@@ -190,6 +190,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the <kerberosv5/krb5.h> header file. */
+#undef HAVE_KERBEROSV5_KRB5_H
+
 /* Define to 1 if you have the <krb5.h> header file. */
 #undef HAVE_KRB5_H
 
diff --git a/configure b/configure
index adc6d58819..d585e0ca90 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.443.26.15 2010/06/03 02:35:53 marka Exp $
+# $Id: configure,v 1.443.26.16 2010/06/03 03:56:41 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.457.26.21 .
+# From configure.in Revision: 1.457.26.22 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.62.
 #
@@ -23557,7 +23557,8 @@ $as_echo "$as_me: error: gssapi.h not found" >&2;}
 
 
 
-for ac_header in krb5.h krb5/krb5.h
+
+for ac_header in krb5.h krb5/krb5.h kerberosv5/krb5.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -23703,8 +23704,8 @@ done
 
 
 		if test "$ISC_PLATFORM_KRB5HEADER" = ""; then
-		    { { $as_echo "$as_me:$LINENO: error: gssapi.h not found" >&5
-$as_echo "$as_me: error: gssapi.h not found" >&2;}
+		    { { $as_echo "$as_me:$LINENO: error: krb5.h not found" >&5
+$as_echo "$as_me: error: krb5.h not found" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 
diff --git a/configure.in b/configure.in
index 1d27949c58..5e92b4049d 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.457.26.21 $)
+AC_REVISION($Revision: 1.457.26.22 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -723,11 +723,11 @@ case "$use_gssapi" in
 		    AC_MSG_ERROR([gssapi.h not found])
 		fi
 
-		AC_CHECK_HEADERS(krb5.h krb5/krb5.h,
+		AC_CHECK_HEADERS(krb5.h krb5/krb5.h kerberosv5/krb5.h,
 		    [ISC_PLATFORM_KRB5HEADER="#define ISC_PLATFORM_KRB5HEADER <$ac_header>"])
 
 		if test "$ISC_PLATFORM_KRB5HEADER" = ""; then
-		    AC_MSG_ERROR([gssapi.h not found])
+		    AC_MSG_ERROR([krb5.h not found])
 		fi
 
 		CPPFLAGS="$saved_cppflags"