diff --git a/ChangeLog b/ChangeLog
index fc22408cf..16837870f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050912
+ - (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by
+   Mike Frysinger.
+
 20050908
  - (tim) [defines.h openbsd-compat/port-uw.c] Add long password support to
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
@@ -2994,4 +2998,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3888 2005/09/09 04:56:33 tim Exp $
+$Id: ChangeLog,v 1.3889 2005/09/13 00:36:10 tim Exp $
diff --git a/configure.ac b/configure.ac
index 1e4df2e33..21d1719ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.292 2005/08/31 16:59:49 tim Exp $
+# $Id: configure.ac,v 1.293 2005/09/13 00:36:10 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -2757,14 +2757,14 @@ AC_ARG_WITH(kerberos5,
 		if test ! -z "$blibpath" ; then
 			blibpath="$blibpath:${KRB5ROOT}/lib"
 		fi
+
+		AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h)
+		AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h)
+		AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h)
+
+		LIBS="$LIBS $K5LIBS"
+		AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
 	fi
-
-	AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h)
-	AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h)
-	AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h)
-
-	LIBS="$LIBS $K5LIBS"
-	AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
 	]
 )