diff --git a/CHANGES b/CHANGES
index 1b65f40..8cb2016 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+----------------------------------------------------------------
+Released 2.4.40 2017-06-xx
+
+Changes since 2.4.39:
+
 ----------------------------------------------------------------
 Released 2.4.39 2017-05-31
 
@@ -1443,4 +1448,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.447 2017/05/31 12:35:00 stroeder Exp $
+$Id: CHANGES,v 1.448 2017/06/23 07:16:26 stroeder Exp $
diff --git a/Lib/dsml.py b/Lib/dsml.py
index d1c854b..0449628 100644
--- a/Lib/dsml.py
+++ b/Lib/dsml.py
@@ -4,13 +4,13 @@
 
 See http://www.python-ldap.org/ for details.
 
-$Id: dsml.py,v 1.56 2017/04/28 20:03:51 stroeder Exp $
+$Id: dsml.py,v 1.57 2017/06/23 07:16:26 stroeder Exp $
 
 Python compability note:
 Tested with Python 2.0+.
 """
 
-__version__ = '2.4.39'
+__version__ = '2.4.40'
 
 import string,base64
 
diff --git a/Lib/ldap/__init__.py b/Lib/ldap/__init__.py
index 939d0be..45d4c27 100644
--- a/Lib/ldap/__init__.py
+++ b/Lib/ldap/__init__.py
@@ -3,12 +3,12 @@
 
 See http://www.python-ldap.org/ for details.
 
-$Id: __init__.py,v 1.117 2017/04/28 20:03:52 stroeder Exp $
+$Id: __init__.py,v 1.118 2017/06/23 07:16:26 stroeder Exp $
 """
 
 # This is also the overall release version number
 
-__version__ = '2.4.39'
+__version__ = '2.4.40'
 
 import sys
 
diff --git a/Lib/ldapurl.py b/Lib/ldapurl.py
index 73fe73a..65d7dc9 100644
--- a/Lib/ldapurl.py
+++ b/Lib/ldapurl.py
@@ -3,7 +3,7 @@
 
 See http://www.python-ldap.org/ for details.
 
-\$Id: ldapurl.py,v 1.92 2017/04/28 20:03:51 stroeder Exp $
+\$Id: ldapurl.py,v 1.93 2017/06/23 07:16:26 stroeder Exp $
 
 Python compability note:
 This module only works with Python 2.0+ since
@@ -11,7 +11,7 @@
 2. list comprehensions are used.
 """
 
-__version__ = '2.4.39'
+__version__ = '2.4.40'
 
 __all__ = [
   # constants
diff --git a/Lib/ldif.py b/Lib/ldif.py
index ce37a07..6dce79a 100644
--- a/Lib/ldif.py
+++ b/Lib/ldif.py
@@ -3,13 +3,13 @@
 
 See http://www.python-ldap.org/ for details.
 
-$Id: ldif.py,v 1.112 2017/04/28 20:03:51 stroeder Exp $
+$Id: ldif.py,v 1.113 2017/06/23 07:16:26 stroeder Exp $
 
 Python compability note:
 Tested with Python 2.0+, but should work with Python 1.5.2+.
 """
 
-__version__ = '2.4.39'
+__version__ = '2.4.40'
 
 __all__ = [
   # constants
diff --git a/Lib/slapdtest.py b/Lib/slapdtest.py
index 67e5464..c1d57c8 100644
--- a/Lib/slapdtest.py
+++ b/Lib/slapdtest.py
@@ -4,13 +4,13 @@
 
 See http://www.python-ldap.org/ for details.
 
-$Id: slapdtest.py,v 1.12 2017/05/31 12:35:00 stroeder Exp $
+$Id: slapdtest.py,v 1.13 2017/06/23 07:16:26 stroeder Exp $
 
 Python compability note:
 This module only works with Python 2.7.x since
 """
 
-__version__ = '2.4.39'
+__version__ = '2.4.40'
 
 import os
 import socket