diff --git a/ChangeLog b/ChangeLog
index 8951ab51..a69958e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-2-7  Federico Di Gregorio  <fog@initd.org>
+
+	* setup.py: added patch by Valentino Volonghi to build on MacOS X.
+
 2005-01-29  Federico Di Gregorio  <fog@debian.org>
 
 	* psycopg/pqpath.c (_pq_fetch_tuples): fixed scale-related
diff --git a/setup.py b/setup.py
index 605b626c..32f8fff2 100644
--- a/setup.py
+++ b/setup.py
@@ -102,7 +102,12 @@ if sys.platform == "darwin":
     # fink installs lots of goodies in /sw/... - make sure we check there
     include_dirs.append("/sw/include/postgresql")
     library_dirs.append("/sw/lib")
-    
+    include_dirs.append("/opt/local/include/postgresql")
+    library_dirs.append("/opt/local/lib")
+    library_dirs.append("/usr/lib")
+    libraries.append('ssl')
+    libraries.append('crypto')
+
 # sources
 
 sources = [