--- /configure.ac
+++ /configure.ac
@@ -3829,11 +3829,29 @@
 			AC_DEFINE(ENABLE_GSS, 1, [ENABLE_GSS])
 	], [
 			AC_MSG_RESULT(no)
+
+			AC_MSG_CHECKING(for gssapi/gssapi.h)
+			AC_TRY_COMPILE([
+					#include <gssapi/gssapi.h>
+			], [
+			],[
+					AC_MSG_RESULT(yes)
+					enable_gss=yes
+
+					AC_DEFINE(ENABLE_GSS, 1, [ENABLE_GSS])
+					AC_DEFINE(HAVE_HEIMDAL_HEADERS, 1, [HAVE_HEIMDAL_HEADERS])
+			], [
+					AC_MSG_RESULT(no)
+			])
 	])
 
 	AC_MSG_CHECKING(for GSS_SPNEGO_MECHANISM)
 	AC_TRY_COMPILE([
+			#if HAVE_HEIMDAL_HEADERS
+			#include <gssapi/gssapi.h>
+			#else
 			#include <gssapi/gssapi_ext.h>
+			#endif
 			#include <gssapi/gssapi_krb5.h>
 			gss_OID_set_desc gss_mech_spnego_OID_set_desc = {.count = 1, .elements = GSS_SPNEGO_MECHANISM};
 	], [
@@ -3844,6 +3862,15 @@
 			AC_MSG_RESULT(no)
 	])
 
+	gssapi_lib=""
+	AC_CHECK_LIB(gssapi_krb5, gss_acquire_cred, [
+		gssapi_lib="-lgssapi_krb5"
+	], [
+		AC_CHECK_LIB(gssapi, gss_acquire_cred, [
+			gssapi_lib="-lgssapi"
+		])
+	])
+
 	AM_CONDITIONAL(ENABLE_GSS, test x$enable_gss = xyes)
 
 	AC_CHECK_HEADERS([crt_externs.h])
@@ -6494,7 +6521,7 @@
 	MONO_NATIVE_CFLAGS=$CFLAGS
 	MONO_NATIVE_LDFLAGS=$LDFLAGS
 	if test x$enable_gss = xyes; then
-		MONO_NATIVE_LDFLAGS="$MONO_NATIVE_LDFLAGS -lgssapi_krb5"
+		MONO_NATIVE_LDFLAGS="$MONO_NATIVE_LDFLAGS ${gssapi_lib}"
 	else
 		AC_MSG_WARN([GSS is not enabled, it requires libkrb5-dev package])
 	fi