diff --git a/CHANGES b/CHANGES
index 436b789..442d431 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,8 @@ Lib/
 * 
 
 Modules/
-* 
+* Added support for getting file descriptor of connection
+  with ldap.OPT_DESC
 
 ----------------------------------------------------------------
 Released 2.4.16 2014-09-10
@@ -1121,4 +1122,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.325 2014/09/12 12:00:08 stroeder Exp $
+$Id: CHANGES,v 1.326 2014/09/12 12:02:21 stroeder Exp $
diff --git a/Modules/constants.c b/Modules/constants.c
index 458ae09..58a8db5 100644
--- a/Modules/constants.c
+++ b/Modules/constants.c
@@ -1,6 +1,6 @@
 /* constants defined for LDAP
  * See http://www.python-ldap.org/ for details.
- * $Id: constants.c,v 1.58 2014/03/12 23:02:42 stroeder Exp $ */
+ * $Id: constants.c,v 1.59 2014/09/12 12:02:21 stroeder Exp $ */
 
 #include "common.h"
 #include "constants.h"
@@ -155,6 +155,7 @@ LDAPinit_constants( PyObject* d )
   add_int(d,OPT_API_FEATURE_INFO);
   add_int(d,OPT_HOST_NAME);
 
+  add_int(d,OPT_DESC);
   add_int(d,OPT_DIAGNOSTIC_MESSAGE);
 
   add_int(d,OPT_ERROR_STRING);
diff --git a/Modules/options.c b/Modules/options.c
index 9cad581..f7c97b1 100644
--- a/Modules/options.c
+++ b/Modules/options.c
@@ -1,5 +1,5 @@
 /* See http://www.python-ldap.org/ for details.
- * $Id: options.c,v 1.41 2013/09/11 08:16:27 stroeder Exp $ */
+ * $Id: options.c,v 1.42 2014/09/12 12:02:21 stroeder Exp $ */
 
 #include "common.h"
 #include "errors.h"
@@ -236,6 +236,7 @@ LDAP_get_option(LDAPObject *self, int option)
     case LDAP_OPT_PROTOCOL_VERSION:
     case LDAP_OPT_ERROR_NUMBER:
     case LDAP_OPT_DEBUG_LEVEL:
+    case LDAP_OPT_DESC:
 #ifdef HAVE_TLS
     case LDAP_OPT_X_TLS:
     case LDAP_OPT_X_TLS_REQUIRE_CERT: