diff --git a/CHANGES b/CHANGES
index 1abeaac..18e2632 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,8 +11,12 @@ Lib/
   string of digits
 * Support for X-SUBST in schema element class LDAPSyntax
 * Support for X-ORDERED and X-ORIGIN in schema element class AttributeType
+* ldapurl: New scope 'subordinates' defined in 
+  draft-sermersheim-ldap-subordinate-scope
 
 Modules/
+* New constant ldap.SCOPE_SUBORDINATE derived from ldap.h for 
+  draft-sermersheim-ldap-subordinate-scope
 
 ----------------------------------------------------------------
 Released 2.4.14 2014-01-31
@@ -1092,4 +1096,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.315 2014/03/12 21:44:10 stroeder Exp $
+$Id: CHANGES,v 1.316 2014/03/12 23:02:42 stroeder Exp $
diff --git a/Lib/ldapurl.py b/Lib/ldapurl.py
index af501a4..01a7703 100644
--- a/Lib/ldapurl.py
+++ b/Lib/ldapurl.py
@@ -3,7 +3,7 @@ ldapurl - handling of LDAP URLs as described in RFC 4516
 
 See http://www.python-ldap.org/ for details.
 
-\$Id: ldapurl.py,v 1.63 2013/08/13 12:33:08 stroeder Exp $
+\$Id: ldapurl.py,v 1.64 2014/03/12 23:02:42 stroeder Exp $
 
 Python compability note:
 This module only works with Python 2.0+ since
@@ -30,8 +30,9 @@ from urllib import quote,unquote
 LDAP_SCOPE_BASE = 0
 LDAP_SCOPE_ONELEVEL = 1
 LDAP_SCOPE_SUBTREE = 2
+LDAP_SCOPE_SUBORDINATES = 3
 
-SEARCH_SCOPE_STR = {None:'',0:'base',1:'one',2:'sub'}
+SEARCH_SCOPE_STR = {None:'',0:'base',1:'one',2:'sub',3:'subordinates'}
 
 SEARCH_SCOPE = {
   '':None,
@@ -39,6 +40,8 @@ SEARCH_SCOPE = {
   'base':LDAP_SCOPE_BASE,
   'one':LDAP_SCOPE_ONELEVEL,
   'sub':LDAP_SCOPE_SUBTREE,
+  # from draft-sermersheim-ldap-subordinate-scope
+  'subordinates':LDAP_SCOPE_SUBORDINATES,
 }
 
 # Some widely used types
diff --git a/Modules/constants.c b/Modules/constants.c
index d815edd..458ae09 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.57 2013/09/11 08:16:27 stroeder Exp $ */
+ * $Id: constants.c,v 1.58 2014/03/12 23:02:42 stroeder Exp $ */
 
 #include "common.h"
 #include "constants.h"
@@ -119,6 +119,9 @@ LDAPinit_constants( PyObject* d )
   add_int(d,SCOPE_BASE);
   add_int(d,SCOPE_ONELEVEL);
   add_int(d,SCOPE_SUBTREE);
+#ifdef LDAP_SCOPE_SUBORDINATE
+  add_int(d,SCOPE_SUBORDINATE);
+#endif
   add_int(d,MOD_ADD);
   add_int(d,MOD_DELETE);
   add_int(d,MOD_REPLACE);
@@ -191,6 +194,9 @@ LDAPinit_constants( PyObject* d )
 #ifdef LDAP_OPT_X_TLS_CIPHER
   add_int(d,OPT_X_TLS_CIPHER);
 #endif
+#ifdef LDAP_OPT_X_TLS_PEERCERT
+  add_int(d,OPT_X_TLS_PEERCERT);
+#endif
 #ifdef LDAP_OPT_X_TLS_CRLCHECK
   /* only available if OpenSSL supports it => might cause backward compability problems */
   add_int(d,OPT_X_TLS_CRLCHECK);