diff --git a/CHANGES b/CHANGES
index 6b01e7d..c5586f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,14 @@
+----------------------------------------------------------------
+Released 2.4.18 2014-xx-xx
+
+Changes since 2.4.17:
+
+Lib/
+* 
+
+Modules/
+* 
+
 ----------------------------------------------------------------
 Released 2.4.17 2014-09-27
 
@@ -1123,4 +1134,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.329 2014/09/27 09:39:58 stroeder Exp $
+$Id: CHANGES,v 1.330 2014/10/08 17:16:04 stroeder Exp $
diff --git a/Doc/conf.py b/Doc/conf.py
index cbcf361..542324e 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -11,7 +11,7 @@
 # All configuration values have a default value; values that are commented out
 # serve to show the default value.
 #
-# $Id: conf.py,v 1.19 2014/09/27 10:18:04 stroeder Exp $
+# $Id: conf.py,v 1.20 2014/10/08 17:16:05 stroeder Exp $
 
 import sys
 
@@ -44,7 +44,7 @@ copyright = '2008-2014, python-ldap project team'
 # The short X.Y version.
 version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.17.0'
+release = '2.4.18.0'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
diff --git a/Lib/dsml.py b/Lib/dsml.py
index d0f82d3..8814315 100644
--- a/Lib/dsml.py
+++ b/Lib/dsml.py
@@ -4,13 +4,13 @@ dsml - generate and parse DSMLv1 data
 
 See http://www.python-ldap.org/ for details.
 
-$Id: dsml.py,v 1.34 2014/09/12 12:00:09 stroeder Exp $
+$Id: dsml.py,v 1.35 2014/10/08 17:16:05 stroeder Exp $
 
 Python compability note:
 Tested with Python 2.0+.
 """
 
-__version__ = '2.4.17'
+__version__ = '2.4.18'
 
 import string,base64
 
diff --git a/Lib/ldap/__init__.py b/Lib/ldap/__init__.py
index fe4d2ed..3dc356d 100644
--- a/Lib/ldap/__init__.py
+++ b/Lib/ldap/__init__.py
@@ -3,12 +3,12 @@ ldap - base module
 
 See http://www.python-ldap.org/ for details.
 
-$Id: __init__.py,v 1.94 2014/09/12 12:00:09 stroeder Exp $
+$Id: __init__.py,v 1.95 2014/10/08 17:16:05 stroeder Exp $
 """
 
 # This is also the overall release version number
 
-__version__ = '2.4.17'
+__version__ = '2.4.18'
 
 import sys
 
diff --git a/Lib/ldapurl.py b/Lib/ldapurl.py
index 1ca288c..8b8a917 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.67 2014/09/12 12:00:09 stroeder Exp $
+\$Id: ldapurl.py,v 1.68 2014/10/08 17:16:05 stroeder Exp $
 
 Python compability note:
 This module only works with Python 2.0+ since
@@ -11,7 +11,7 @@ This module only works with Python 2.0+ since
 2. list comprehensions are used.
 """
 
-__version__ = '2.4.17'
+__version__ = '2.4.18'
 
 __all__ = [
   # constants
diff --git a/Lib/ldif.py b/Lib/ldif.py
index 78fdb52..92323dd 100644
--- a/Lib/ldif.py
+++ b/Lib/ldif.py
@@ -3,13 +3,13 @@ ldif - generate and parse LDIF data (see RFC 2849)
 
 See http://www.python-ldap.org/ for details.
 
-$Id: ldif.py,v 1.76 2014/09/12 12:00:09 stroeder Exp $
+$Id: ldif.py,v 1.77 2014/10/08 17:16:05 stroeder Exp $
 
 Python compability note:
 Tested with Python 2.0+, but should work with Python 1.5.2+.
 """
 
-__version__ = '2.4.17'
+__version__ = '2.4.18'
 
 __all__ = [
   # constants