diff --git a/configure.ac b/configure.ac
index 1f801adccde4903d6280f774da22878e942c08f8..64887ef21112a3d8a27c1441d46fd8fd002ef570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3354,7 +3354,7 @@ if test "x$USE_WINDOWS_SSPI" = "x1"; then
 fi
 
 if test "x$HAVE_GSSAPI" = "x1"; then
-  SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API krb5"
+  SUPPORT_FEATURES="$SUPPORT_FEATURES GSS-API"
 fi
 
 if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \
@@ -3363,7 +3363,7 @@ if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \
 fi
 
 if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \
-    \( "x$USE_WINDOWS_SSPI" = "x1" \); then
+    \( "x$HAVE_GSSAPI" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \); then
   SUPPORT_FEATURES="$SUPPORT_FEATURES krb5"
 fi