diff --git a/ChangeLog b/ChangeLog
index d63f89d6..6911f69e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-16  Federico Di Gregorio  <fog@initd.org>
 
+	* Preparing release 2.0 beta 6.
+
 	* lib/__init__.py: very nice hack from Harald Armin Massa to allow
 	py2exe and similar tools to do their work without problems.
 
diff --git a/NEWS b/NEWS
index efdeb142..41907c1b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ What's new in psycopg 2.0 beta 6
 
 * Safer parsing of time intervals.
 
+* Better parsing of times and dates, no more locale problems.
+
+* Should now play well with py2exe and similar tools.
+
+* The "decimal" module is now used if available under Python 2.3.
+
 What's new in psycopg 2.0 beta 5
 --------------------------------
 
diff --git a/ZPsycopgDA/DA.py b/ZPsycopgDA/DA.py
index 096ac699..1757c4dc 100644
--- a/ZPsycopgDA/DA.py
+++ b/ZPsycopgDA/DA.py
@@ -18,7 +18,7 @@
 # See the LICENSE file for details.
 
 
-ALLOWED_PSYCOPG_VERSIONS = ('2.0b4', '2.0b5')
+ALLOWED_PSYCOPG_VERSIONS = ('2.0b4', '2.0b5', '2.0b6')
 
 import sys
 import time
@@ -59,12 +59,12 @@ def manage_addZPsycopgConnection(self, id, title, connection_string,
 # the connection object
 
 class Connection(Shared.DC.ZRDB.Connection.Connection):
-    """ZPsycopg 2 Connection."""
+    """ZPsycopg Connection."""
     _isAnSQLConnection = 1
     
-    id                = 'Psycopg2_database_connection' 
-    database_type     = 'Psycopg2'
-    meta_type = title = 'Z Psycopg 2 Database Connection'
+    id                = 'Psycopg_database_connection' 
+    database_type     = 'Psycopg'
+    meta_type = title = 'Z Psycopg Database Connection'
     icon              = 'misc_/ZPsycopgDA/conn'
 
     def __init__(self, id, title, connection_string,
@@ -185,7 +185,7 @@ class Connection(Shared.DC.ZRDB.Connection.Connection):
 
 classes = (Connection,)
 
-meta_types = ({'name':'Z Psycopg 2 Database Connection',
+meta_types = ({'name':'Z Psycopg Database Connection',
                'action':'manage_addZPsycopgConnectionForm'},)
 
 folder_methods = {
@@ -193,7 +193,7 @@ folder_methods = {
     'manage_addZPsycopgConnectionForm': manage_addZPsycopgConnectionForm}
 
 __ac_permissions__ = (
-    ('Add Z Psycopg 2 Database Connections',
+    ('Add Z Psycopg Database Connections',
      ('manage_addZPsycopgConnectionForm', 'manage_addZPsycopgConnection')),)
 
 # add icons
diff --git a/ZPsycopgDA/__init__.py b/ZPsycopgDA/__init__.py
index 5a0403ed..dc95cb38 100644
--- a/ZPsycopgDA/__init__.py
+++ b/ZPsycopgDA/__init__.py
@@ -17,7 +17,7 @@
 #
 # See the LICENSE file for details.
 
-__doc__ = "ZPsycopg 2 Database Adapter Registration." 
+__doc__ = "ZPsycopg Database Adapter Registration." 
 __version__ = '2.0'
 
 import DA