diff --git a/ChangeLog b/ChangeLog
index e73e74f0..aa79005a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-01-16  Federico Di Gregorio  <fog@initd.org>
 
+	* psycopg/psycopgmodule.c: applied LATIN patch from #148.
+
 	* psycopg/connection_type.c: obfuscate password after using it.
 
 	* lib/extras.py: moved SQL_IN to extensions.py; we're now officially
diff --git a/psycopg/psycopgmodule.c b/psycopg/psycopgmodule.c
index 5f378568..123e3e21 100644
--- a/psycopg/psycopgmodule.c
+++ b/psycopg/psycopgmodule.c
@@ -296,13 +296,20 @@ psyco_adapters_init(PyObject *mod)
 
 static encodingPair encodings[] = {
     {"SQL_ASCII",    "ascii"},
-    {"LATIN1",       "latin_1"},
+    {"LATIN1",       "iso8859_1"},
+    {"LATIN2",       "iso8859_2"}, 
+    {"LATIN3",       "iso8859_3"}, 
+    {"LATIN4",       "iso8859_4"}, 
+    {"LATIN5",       "iso8859_9"}, 
+    {"LATIN6",       "iso8859_10"}, 
+    {"LATIN7",       "iso8859_13"}, 
+    {"LATIN8",       "iso8859_14"}, 
+    {"LATIN9",       "iso8859_15"},    
     {"UNICODE",      "utf_8"},
     {"UTF8",         "utf_8"},
     
     /* some compatibility stuff */
     {"LATIN-1",      "latin_1"},
-    
     {NULL, NULL}
 };
 static void psyco_encodings_fill(PyObject *dict)