diff --git a/ChangeLog b/ChangeLog
index 439386e9..60642941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-05  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
+
+	* setup.py: bumped to version 2.3.dev0
+
+	* merged dev branches for 2 phase commit, notify payload, hstore adapter
+
 2010-10-08  Daniele Varrazzo  <daniele.varrazzo@gmail.com>
 
 	* psycopg/typecast_binary.c: use PQfreemem to free memory allocated by
diff --git a/setup.py b/setup.py
index acc0cbdc..6973760b 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,10 @@ from distutils.command.build_ext import build_ext
 from distutils.sysconfig import get_python_inc
 from distutils.ccompiler import get_default_compiler
 
-PSYCOPG_VERSION = '2.2.3-devel'
+# take a look at http://www.python.org/dev/peps/pep-0386/
+# for a consistent versioning pattern
+PSYCOPG_VERSION = '2.3.dev0'
+
 version_flags   = ['dt', 'dec']
 
 PLATFORM_IS_WINDOWS = sys.platform.lower().startswith('win')