diff --git a/ChangeLog b/ChangeLog
index b31750b5..79477e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-21  Federico Di Gregorio <fog@initd.org>
+
+	* Applied win32 patch from Jason Erickson.
+
+	* Applied patch from Thomas Lotze to use correct version
+	for new Zopes.
+
 2007-12-20  James Henstridge  <james@jamesh.id.au>
 
 	* psycopg/pqpath.c (pq_execute): uncomment the "curs->pgres ==
diff --git a/ZPsycopgDA/DA.py b/ZPsycopgDA/DA.py
index 9a24dba5..04ea6ce8 100644
--- a/ZPsycopgDA/DA.py
+++ b/ZPsycopgDA/DA.py
@@ -37,10 +37,13 @@ from DateTime import DateTime
 # Build Zope version in a float for later cheks
 import App
 zope_version = App.version_txt.getZopeVersion()
-zope_version = float("%s.%s" %(zope_version[:2]))
+if zope_version[1] == -1:
+    zope_version = None
+else:
+    zope_version = float("%s.%s" %(zope_version[:2]))
 
 # ImageFile is deprecated in Zope >= 2.9
-if zope_version < 2.9:
+if zope_version is not None and zope_version < 2.9:
      from ImageFile import ImageFile
 else:
      from App.ImageFile import ImageFile 
diff --git a/psycopg2.mdp b/psycopg2.mdp
index dfb98c58..4c562f5c 100644
--- a/psycopg2.mdp
+++ b/psycopg2.mdp
@@ -130,6 +130,9 @@
     <File name="./tests/test_psycopg2_dbapi20.py" subtype="Code" buildaction="Nothing" />
     <File name="./tests/test_transaction.py" subtype="Code" buildaction="Nothing" />
     <File name="./tests/types_basic.py" subtype="Code" buildaction="Nothing" />
+    <File name="./tests/bugX000.py" subtype="Code" buildaction="Nothing" />
+    <File name="./tests/Makefile" subtype="Code" buildaction="Nothing" />
+    <File name="./tests/runtests.py" subtype="Code" buildaction="Nothing" />
   </Contents>
   <compiler ctype="GccCompiler" />
   <MonoDevelop.ChangeLogAddIn.ChangeLogInfo policy="UpdateNearestChangeLog" />