diff --git a/CHANGES b/CHANGES
index a29365c465762acc3473113623f64b55e705a263..745e98a3692a33f1763fff10b9c20cbce6d0247f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1266,8 +1266,11 @@ o foreach( arr[-two()..], string x), where two() returns 2 will no
   longer iterate over the first element in the array three times or
   crash.
 
+o Postgres.postgres_result now properly decodes binary blobs and
+  strips trailing spaces from CHAR columns.
+
 o Fixed a typo from 2001-05-05 that caused a lot of countries to
-  recide on the continent ',Europa' instead of "Europa" in
+  reside on the continent ',Europa' instead of "Europa" in
   Geography.Countries.
 
   Obviously the continent is not that often checked.
diff --git a/src/modules/Postgres/pgresult.c b/src/modules/Postgres/pgresult.c
index 74c1ef646e36cac7723d71710530a50a3f848101..d1374d5b512253a8fd86336fe0e356a84130932d 100644
--- a/src/modules/Postgres/pgresult.c
+++ b/src/modules/Postgres/pgresult.c
@@ -115,7 +115,10 @@ extern PIKE_MUTEX_T pike_postgres_mutex;
 
 #include "pg_types.h"
 
-
+#ifndef BYTEAOID
+#define BYTEAOID        17
+#define BPCHAROID       1042
+#endif
 
 #define THIS ((struct postgres_result_object_data *) Pike_fp->current_storage)