diff --git a/Doc/ldapurl.rst b/Doc/ldapurl.rst
new file mode 100644
index 0000000..b5bea92
--- /dev/null
+++ b/Doc/ldapurl.rst
@@ -0,0 +1,126 @@
+.. % $Id: ldapurl.rst,v 1.9 2011/07/22 13:27:01 stroeder Exp $
+
+###################################
+:py:mod:`ldapurl` LDAP URL handling
+###################################
+
+.. py:module:: ldapurl
+   :synopsis: Parses and generates LDAP URLs
+.. moduleauthor:: python-ldap project (see http://www.python-ldap.org/)
+
+
+This module parses and generates LDAP URLs.    It is implemented in pure Python
+and does not rely on any  non-standard modules. Therefore it can be used stand-
+alone without  the rest of the python-ldap package.    Compability note: This
+module has been solely tested on Python 2.x and above.
+
+.. seealso::
+
+   :rfc:`4516` - The LDAP URL Format
+
+
+Constants
+=========
+
+The :mod:`ldapurl` module exports the following constants:
+
+.. py:data:: SEARCH_SCOPE
+
+   This dictionary maps a search scope string identifier  to the corresponding
+   integer value used with search operations  in :mod:`ldap`.
+
+
+.. py:data:: SEARCH_SCOPE_STR
+
+   This dictionary is the inverse to :const:`SEARCH_SCOPE`. It  maps a search scope
+   integer value to the corresponding string identifier  used in a LDAP URL string
+   representation.
+
+
+.. py:data:: LDAP_SCOPE_BASE
+
+
+.. py:data:: LDAP_SCOPE_ONELEVEL
+
+
+.. py:data:: LDAP_SCOPE_SUBTREE
+
+
+Functions
+=========
+
+.. autofunction:: ldapurl.isLDAPUrl
+
+
+.. autofunction:: ldapurl.ldapUrlEscape
+
+
+Classes
+=======
+
+.. _ldapurl-ldapurl:
+
+LDAP URLs
+^^^^^^^^^
+
+A :py:class:`LDAPUrl` object represents a complete LDAP URL.
+
+.. autoclass:: ldapurl.LDAPUrl 
+
+
+LDAP URL extensions
+^^^^^^^^^^^^^^^^^^^
+
+A :py:class:`LDAPUrlExtension` object represents a single LDAP URL extension
+whereas :py:class:`LDAPUrlExtensions` represents a list of LDAP URL extensions.
+
+
+.. _ldapurl-ldapurlextension:
+
+.. autoclass:: ldapurl.LDAPUrlExtension
+
+.. _ldapurl-ldapurlextensions:
+
+.. autoclass:: ldapurl.LDAPUrlExtensions
+
+
+.. _ldapurl-example:
+
+Example
+^^^^^^^
+
+Important security advice:
+For security reasons you shouldn't specify passwords in LDAP URLs
+unless you really know what you are doing.
+
+The following example demonstrates how to parse a LDAP URL
+with :mod:`ldapurl` module.
+
+
+>>> import ldapurl
+>>> ldap_url = ldapurl.LDAPUrl('ldap://localhost:1389/dc=stroeder,dc=com?cn,mail???bindname=cn=Michael%2cdc=stroeder%2cdc=com,X-BINDPW=secret')
+>>> # Using the parsed LDAP URL by reading the class attributes
+>>> ldap_url.dn
+'dc=stroeder,dc=com'
+>>> ldap_url.hostport
+'localhost:1389'
+>>> ldap_url.attrs
+['cn','mail']
+>>> ldap_url.filterstr
+'(objectclass=*)'
+>>> ldap_url.who
+'cn=Michael,dc=stroeder,dc=com'
+>>> ldap_url.cred
+'secret'
+>>> ldap_url.scope
+0
+
+
+The following example demonstrates how to generate a LDAP URL
+with \module{ldapurl} module.
+
+>>> import ldapurl
+>>> ldap_url = ldapurl.LDAPUrl(hostport='localhost:1389',dn='dc=stroeder,dc=com',attrs=['cn','mail'],who='cn=Michael,dc=stroeder,dc=com',cred='secret')
+>>> ldap_url.unparse()
+'ldap://localhost:1389/dc=stroeder,dc=com?cn,mail?base?(objectclass=*)?bindname=cn=Michael%2Cdc=stroeder%2Cdc=com,X-BINDPW=secret'
+
diff --git a/Lib/ldap/extop/__init__.py b/Lib/ldap/extop/__init__.py
new file mode 100644
index 0000000..2ab61c6
--- /dev/null
+++ b/Lib/ldap/extop/__init__.py
@@ -0,0 +1,74 @@
+"""
+controls.py - support classes for LDAPv3 extended operations
+
+See http://www.python-ldap.org/ for details.
+
+\$Id: __init__.py,v 1.4 2011/07/22 13:27:02 stroeder Exp $
+
+Description:
+The ldap.extop module provides base classes for LDAPv3 extended operations.
+Each class provides support for a certain extended operation request and
+response.
+"""
+
+from ldap import __version__
+
+
+class ExtendedRequest:
+  """
+  Generic base class for a LDAPv3 extended operation request
+
+  requestName
+      OID as string of the LDAPv3 extended operation request
+  requestValue
+      value of the LDAPv3 extended operation request
+      (here it is the BER-encoded ASN.1 request value)
+  """
+
+  def __init__(self,requestName,requestValue):
+    self.requestName = requestName
+    self.requestValue = requestValue
+
+  def __repr__(self):
+    return '%s(%s,%s)' % (self.__class__.__name__,self.requestName,self.requestValue)
+
+  def encodedRequestValue(self):
+    """
+    returns the BER-encoded ASN.1 request value composed by class attributes
+    set before
+    """
+    return self.requestValue
+
+
+class ExtendedResponse:
+  """
+  Generic base class for a LDAPv3 extended operation response
+
+  requestName
+      OID as string of the LDAPv3 extended operation response
+  encodedResponseValue
+      BER-encoded ASN.1 value of the LDAPv3 extended operation response
+  """
+
+  def __init__(self,responseName,encodedResponseValue):
+    self.responseName = responseName
+    self.responseValue = self.decodeResponseValue(encodedResponseValue)
+
+  def __repr__(self):
+    return '%s(%s,%s)' % (self.__class__.__name__,self.responseName,self.responseValue)
+
+  def decodeResponseValue(self,value):
+    """
+    decodes the BER-encoded ASN.1 extended operation response value and
+    sets the appropriate class attributes
+    """
+    return value
+
+
+# Optionally import sub-modules which need pyasn1 et al
+try:
+  import pyasn1,pyasn1_modules.rfc2251
+except ImportError:
+  pass
+else:
+  from ldap.extop.dds import *