diff --git a/configure.ac b/configure.ac
index 94190eb01a..fa951e69f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,21 @@ AC_SUBST([AKLOG_KRB5_LIBS])
 
 dnl Probe for GSSAPI
 RRA_LIB_GSSAPI
+dnl Check for the characteristics of whatever GSSAPI we found, if we found one
+BUILD_GSSAPI=no
+AS_IF([test x"$GSSAPI_LIBS" != x],
+    [BUILD_GSSAPI=yes
+     RRA_LIB_GSSAPI_SWITCH
+     AC_CHECK_FUNCS([gss_pseudo_random \
+	krb5_gss_register_acceptor_identity \
+	gss_krb5_ccache_name \
+     ])
+dnl We only need gssapi for rxgk (at this point).  rxgk requires pseudo_random.
+     AS_IF([test x"$ac_cv_func_gss_pseudo_random" != xyes],
+	   [BUILD_GSSAPI=no])
+     RRA_LIB_GSSAPI_RESTORE
+])
+AC_SUBST([BUILD_GSSAPI])
 
 dnl Checks for summary
 OPENAFS_SUMMARY_CHECK_NAMEI
diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 188c40ddf8..2ca1540642 100644
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -56,6 +56,7 @@ LD = @LD@
 LDFLAGS_roken = @LDFLAGS_roken@
 LDFLAGS_hcrypto = @LDFLAGS_hcrypto@
 LDFLAGS_krb5 = @KRB5_LDFLAGS@
+CPPFLAGS_gssapi = @GSSAPI_CPPFLAGS@
 LEX = @LEX@
 LIB_AFSDB = @LIB_AFSDB@
 LIB_crypt = @LIB_crypt@
@@ -63,6 +64,7 @@ LIB_curses = @LIB_curses@
 LIB_hcrypto = @LIB_hcrypto@
 LIB_roken = @LIB_roken@
 LIB_krb5 = @KRB5_LIBS@
+LIB_gssapi = @GSSAPI_LIBS@
 LIBTOOL= @LIBTOOL@
 LIBS = @LIBS@
 LIB_LIBINTL = @LIB_libintl@