diff --git a/ChangeLog b/ChangeLog
index 6eb71c48..04500a4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-19  Federico Di Gregorio  <fog@initd.org>
+
+	* Applied patch from Robert Munro to fix version check
+	in ZPSycopgDA.
+
 2009-05-10  Federico Di Gregorio  <fog@initd.org>
 
 	* Release 2.0.11.
diff --git a/ZPsycopgDA/DA.py b/ZPsycopgDA/DA.py
index 6b9d728e..526a21c9 100644
--- a/ZPsycopgDA/DA.py
+++ b/ZPsycopgDA/DA.py
@@ -116,7 +116,7 @@ class Connection(Shared.DC.ZRDB.Connection.Connection):
             pass
 
         # check psycopg version and raise exception if does not match
-        if psycopg2.__version__[:5] not in ALLOWED_PSYCOPG_VERSIONS:
+        if psycopg2.__version__.split(' ')[0] not in ALLOWED_PSYCOPG_VERSIONS:
             raise ImportError("psycopg version mismatch (imported %s)" %
                               psycopg2.__version__)