diff --git a/include/ldap.h b/include/ldap.h
index 4949f5465854bb2f687e0e4696e7d054125e77de..99ed1fc0113e87c0a87c274a475c5748f455b536 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -119,6 +119,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_NETWORK_TIMEOUT	0x5005	/* socket level timeout */
 #define LDAP_OPT_URI				0x5006
 #define LDAP_OPT_REFERRAL_URLS      0x5007  /* Referral URLs */
+#define LDAP_OPT_SOCKBUF            0x5008  /* sockbuf */
 
 /* OpenLDAP TLS options */
 #define LDAP_OPT_X_TLS				0x6000
diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
index f191cb8161c4d3b34e58e5f104aee74ae392cf27..debbc5b4fe67bbd6af829ed69fa071ae33f7b3a6 100644
--- a/libraries/libldap/options.c
+++ b/libraries/libldap/options.c
@@ -165,6 +165,11 @@ ldap_get_option(
 		ber_sockbuf_ctrl( ld->ld_sb, LBER_SB_OPT_GET_FD, outvalue );
 		return LDAP_OPT_SUCCESS;
 
+	case LDAP_OPT_SOCKBUF:
+		if( ld == NULL ) break;
+		outvalue = ld->ld_sb;
+		return LDAP_OPT_SUCCESS;
+
 	case LDAP_OPT_TIMEOUT:
 		/* the caller has to free outvalue ! */
 		if ( ldap_int_timeval_dup( outvalue, lo->ldo_tm_api) != 0 ) {