diff --git a/ChangeLog b/ChangeLog
index c2ba9c3e..3dce52c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-04-11  Federico Di Gregorio  <fog@initd.org>
 
+	* Release 2.0.6b2.
+
 	* psycopg/cursor_type.c: added check to raise an error when
 	some crazy programmer tries to use different argument formats
 	in the same query string. Fixes #162.
diff --git a/NEWS b/NEWS
index 6f3c6a15..2ae73154 100644
--- a/NEWS
+++ b/NEWS
@@ -3,13 +3,21 @@ What's new in psycopg 2.0.6
 
 * Full support for PostgreSQL 8.2, including NULLs in arrays.
 
+* Full support for Python 2.5 and 64 bit architectures.
+
 * Support for almost all PostgreSQL encodings.
 
 * Better management of times and dates both from Python and in Zope.
 
+* Support for per-connection type-casters (used by ZPsycopgDA too, this
+  fixes a long standing bug that made different connections use a random
+  set of date/time type-casters instead of the configured one.)
+
 * We now have a full list of PostgreSQL error codes available by
   importing the psycopg2.errorcodes module.
 
+* Better build support on win32 platform.
+
 * Fixed some small buglets and build glitches:
   - removed double mutex destroy
   - removed all non-constant initializers
@@ -17,6 +25,8 @@ What's new in psycopg 2.0.6
     on 64 bit architectures
   - fixed several Python API calls to work on 64 bit architectures
   - applied compatibility macros from PEP 353
+  - now using more than one argument format raise an error instead of
+    a segfault
 
 What's new in psycopg 2.0.5.1
 ­----------------------------
diff --git a/ZPsycopgDA/DA.py b/ZPsycopgDA/DA.py
index c4ea82b4..48ac6125 100644
--- a/ZPsycopgDA/DA.py
+++ b/ZPsycopgDA/DA.py
@@ -18,7 +18,7 @@
 # See the LICENSE file for details.
 
 
-ALLOWED_PSYCOPG_VERSIONS = ('2.0.5', '2.0.6b1')
+ALLOWED_PSYCOPG_VERSIONS = ('2.0.5', '2.0.6b2', '2.0.6')
 
 import sys
 import time
diff --git a/setup.cfg b/setup.cfg
index 31e72026..ce6b7fa8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [build_ext]
-define=PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,PSYCOPG_NEW_BOOLEAN,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3,PSYCOPG_DEBUG
+define=PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,PSYCOPG_NEW_BOOLEAN,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3
 # PSYCOPG_EXTENSIONS enables extensions to PEP-249 (you really want this)
 # PSYCOPG_DISPLAY_SIZE enable display size calculation (a little slower)
 # HAVE_PQFREEMEM should be defined on PostgreSQL >= 7.4
diff --git a/setup.py b/setup.py
index 8f912740..a6a885e7 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ 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.0.6b1'
+PSYCOPG_VERSION = '2.0.6b2'
 version_flags   = []
 
 PLATFORM_IS_WINDOWS = sys.platform.lower().startswith('win')