diff --git a/.gitignore b/.gitignore
index 99336509fc..2f138917ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,7 +93,6 @@ libraries/libldap_r/getattr.c
 libraries/libldap_r/getdn.c
 libraries/libldap_r/getentry.c
 libraries/libldap_r/getvalues.c
-libraries/libldap_r/gssapi.c
 libraries/libldap_r/init.c
 libraries/libldap_r/lbase64.c
 libraries/libldap_r/ldap_sync.c
diff --git a/include/ldap.h b/include/ldap.h
index 5f3879e93a..7b4fc9d648 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -202,10 +202,6 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_SASL_USERNAME		0x610c /* read-only */
 #define LDAP_OPT_X_SASL_GSS_CREDS		0x610d
 
-/* OpenLDAP GSSAPI options */
-#define LDAP_OPT_X_GSSAPI_DO_NOT_FREE_CONTEXT      0x6200
-#define LDAP_OPT_X_GSSAPI_ALLOW_REMOTE_PRINCIPAL   0x6201
-
 /*
  * OpenLDAP per connection tcp-keepalive settings
  * (Linux only, ignored where unsupported)
diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 7f0bd73f68..3468ee249c 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -41,7 +41,6 @@ struct ldapoptions ldap_int_global_options =
 		LDAP_LDO_CONNECTIONLESS_NULLARG
 		LDAP_LDO_TLS_NULLARG
 		LDAP_LDO_SASL_NULLARG
-		LDAP_LDO_GSSAPI_NULLARG
 		LDAP_LDO_MUTEX_NULLARG };
 
 #define ATTR_NONE	0
@@ -57,8 +56,6 @@ struct ldapoptions ldap_int_global_options =
 #define ATTR_OPT_TV	8
 #define ATTR_OPT_INT	9
 
-#define ATTR_GSSAPI	10
-
 struct ol_keyvalue {
 	const char *		key;
 	int			value;
@@ -138,7 +135,7 @@ static const struct ol_attribute {
 	{0, ATTR_NONE,		NULL,		NULL,	0}
 };
 
-#define MAX_LDAP_ATTR_LEN  sizeof("GSSAPI_ALLOW_REMOTE_PRINCIPAL")
+#define MAX_LDAP_ATTR_LEN  sizeof("TLS_CIPHER_SUITE")
 #define MAX_LDAP_ENV_PREFIX_LEN 8
 
 static int
diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index d781c543a3..67e8bd6da3 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -305,8 +305,6 @@ struct ldapoptions {
 #define LDAP_LDO_SASL_NULLARG
 #endif
 
-#define LDAP_LDO_GSSAPI_NULLARG
-
 #ifdef LDAP_R_COMPILE
 	ldap_pvt_thread_mutex_t	ldo_mutex;
 #define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL