diff --git a/addons/auth_ldap/README.rst b/addons/auth_ldap/README.rst
index f31047def21f29199b3a9fdc2cfeb965c7991d7f..64f802b01e517b8998557f1275d6cbd44151e55b 100644
--- a/addons/auth_ldap/README.rst
+++ b/addons/auth_ldap/README.rst
@@ -3,7 +3,7 @@ Adds support for authentication by LDAP server.
 This module allows users to login with their LDAP username and password, and
 will automatically create Odoo users for them on the fly.
 
-**Note:** This module only work on servers who have Python's ``ldap`` module installed.
+**Note:** This module only work on servers that have Python's ``python-ldap`` module installed.
 
 Configuration:
 --------------
diff --git a/addons/auth_ldap/__manifest__.py b/addons/auth_ldap/__manifest__.py
index d70b6a545089213e3ed08a6188af405bed855150..fa17447c510fe16c48587a896eba9fe6861b87ba 100644
--- a/addons/auth_ldap/__manifest__.py
+++ b/addons/auth_ldap/__manifest__.py
@@ -11,6 +11,6 @@
         'views/res_config_settings_views.xml',
     ],
     'external_dependencies': {
-        'python': ['pyldap'],
+        'python': ['ldap'],
     }
 }
diff --git a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh
index 82d0b6d96b0172f462cac1513486be2874d3d603..440611211156d7ebf28a3203f7997a9ab0f0aae8 100755
--- a/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh
+++ b/addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh
@@ -68,7 +68,7 @@ PKGS_TO_INSTALL="
     python3-feedparser \
     python3-pil \
     python3-jinja2 \
-    python3-ldap3 \
+    python3-ldap \
     python3-lxml \
     python3-mako \
     python3-mock \
diff --git a/debian/control b/debian/control
index 629c52aa05a4ce664bc85ffe5fbea7cf11bf3668..0530ba7ace670a2203e8e33bfb24c0cd48efc750 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,7 @@ Replaces: tinyerp-server, openerp-server, openerp-web, openerp
 Recommends:
  ${python3:Recommends},
  postgresql,
- python3-pyldap,
+ python3-ldap,
 Description: Open Source Apps To Grow Your Business
  Odoo, formerly known as OpenERP, is a suite of open-source business apps
  written in Python and released under the LGPLv3 license. This suite of
diff --git a/odoo/addons/base/models/ir_module.py b/odoo/addons/base/models/ir_module.py
index 330bd41ffeaa71caa01bedbfda8f3c801c5ec8b1..1d592947d22bb1dec17399b67cfe6bb14b1fd0ec 100644
--- a/odoo/addons/base/models/ir_module.py
+++ b/odoo/addons/base/models/ir_module.py
@@ -315,7 +315,7 @@ class Module(models.Model):
         except pkg_resources.DistributionNotFound as e:
             try:
                 importlib.import_module(pydep)
-                _logger.warning("python external dependency %s should be replaced by it's PyPI package name", pydep)
+                _logger.info("python external dependency on '%s' does not appear to be a valid PyPI package. Using a PyPI package name is recommended.", pydep)
             except ImportError:
                 # backward compatibility attempt failed
                 _logger.warning("DistributionNotFound: %s", e)
diff --git a/requirements.txt b/requirements.txt
index 278039dfa5517f6996b28960c916ce5062b1dfde..2e49ba7b6824fa6cc587d0853d019ae21f74a6f8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,7 +28,7 @@ psutil==5.5.1
 psycopg2==2.7.7; sys_platform != 'win32'
 psycopg2==2.8.3; sys_platform == 'win32'
 pydot==1.4.1
-pyldap==2.4.28; sys_platform != 'win32'
+python-ldap==3.1.0; sys_platform != 'win32'
 pyparsing==2.2.0
 PyPDF2==1.26.0
 pyserial==3.4
diff --git a/setup.cfg b/setup.cfg
index ffccdc094ac50c0d804f9921af75fb46b6b47d17..3bcb7bb3686a92543dcf9015cc83b87f9224268e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,7 +33,6 @@ requires =
   python3-psycopg2
   python3-polib
   python3-pydot
-  python3-pyldap
   python3-pyparsing
   python3-PyPDF2
   python3-pyserial
diff --git a/setup.py b/setup.py
index 47ea33a5a828684bf8fbf91640e642c735079fa2..80baf7e0b1a9113fbfab027afcd0a796e4c914cc 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@ setup(
     ],
     python_requires='>=3.6',
     extras_require={
-        'ldap': ['pyldap'],
+        'ldap': ['python-ldap'],
         'SSL': ['pyopenssl'],
     },
     tests_require=[
diff --git a/setup/win32/winpy_requirements.txt b/setup/win32/winpy_requirements.txt
index ad7081536b40518b821d14cf944233580fd7d2f7..cfeece68d925640b4ca2c069e1989ca172162d67 100644
--- a/setup/win32/winpy_requirements.txt
+++ b/setup/win32/winpy_requirements.txt
@@ -19,7 +19,6 @@ polib>=1.1.0
 psutil>=4.3.1
 psycopg2==2.7.1
 pydot==1.2.3
-pyldap>=2.4.28
 pyparsing==2.1.10
 PyPDF2==1.26.0
 pyserial==3.1.1