diff --git a/configure b/configure
index ae91ae221e..29b4ce8948 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.502 2011/03/30 15:49:28 tbox Exp $
+# $Id: configure,v 1.503 2011/04/05 19:20:21 tbox Exp $
 #
 # 	Portions of this code release fall under one or more of the
 # 	following Copyright notices.  Please see individual source
@@ -21569,7 +21569,9 @@ then
 	# first, deal with the obvious
 	if test \( -f /usr/include/kerberosv5/krb5.h -o \
 		   -f /usr/include/krb5/krb5.h -o \
-		   -f /usr/include/krb5.h \)   -a -f /usr/include/gssapi.h
+		   -f /usr/include/krb5.h \)   -a \
+		\( -f /usr/include/gssapi.h -o
+		   -f /usr/include/gssapi/gssapi.h \)
 	then
 		use_gssapi=/usr
 	else