diff --git a/ChangeLog b/ChangeLog
index 8b99c354..3842f6e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31  Federico Di Gregorio  <fog@initd.org>
+
+	* psycopg/psycopgmodule.c: fixed memory leak in custom exceptions
+	(applied patch from #114).
+
 2006-07-26  Federico Di Gregorio  <fog@initd.org>
 
 	* psycopg/adapter_datetime.c (pydatetime_str): fixed error
diff --git a/psycopg/psycopgmodule.c b/psycopg/psycopgmodule.c
index f711df80..32d70b2b 100644
--- a/psycopg/psycopgmodule.c
+++ b/psycopg/psycopgmodule.c
@@ -429,6 +429,7 @@ psyco_set_error(PyObject *exc, PyObject *curs, char *msg,
             PyObject_SetAttrString(err, "cursor", Py_None);
 
         PyErr_SetObject(exc, err);
+	Py_DECREF(err);
     }
 }