diff --git a/AUTHORS b/AUTHORS
index 68da2d9d62..618efd45d9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -84,6 +84,7 @@ Andrew Arensburger <arensb@cfar.umd.edu> for FreeBSD & other patches
 Matt Armstrong <matt_armstrong@bigfoot.com> for misc fixes
 Fred Baube <fred@moremagic.com> for attempted Java port/MoneyDance
 Dennis Björklund <dennisb@cs.chalmers.se> Swedish translation
+Andreas Bogk <andreas@andreas.org> Postgres backend patch
 Per Bojsen <bojsen@worldnet.att.net> several core dump fixes
 Terry Boldt <tboldt@attglobal.net> financial calculator and expression parser
 Richard Braakman <dark@xs4all.nl> xml version configure patch
diff --git a/doc/sgml/C/xacc-about.sgml b/doc/sgml/C/xacc-about.sgml
index ef24063c81..748e1c0cae 100644
--- a/doc/sgml/C/xacc-about.sgml
+++ b/doc/sgml/C/xacc-about.sgml
@@ -233,6 +233,14 @@ linkend="scheme"> Scheme </link>, the <link linkend="gwrap"> g-wrap
 </glossdef>
 </glossentry>
 
+<glossentry>
+<glossterm><email>andreas@andreas.org</email> Andreas
+      Bogk</glossterm>
+<glossdef>
+<para>Postgres backend patch</para>
+</glossdef>
+</glossentry>
+
 <glossentry>
 <glossterm><email>bojsen@worldnet.att.net</email> Per
       Bojsen</glossterm>
diff --git a/src/backend/postgres/PostgresBackend.c b/src/backend/postgres/PostgresBackend.c
index 3f7a166ff5..e514d3bc17 100644
--- a/src/backend/postgres/PostgresBackend.c
+++ b/src/backend/postgres/PostgresBackend.c
@@ -33,6 +33,7 @@
 #include <string.h>  
 #include <sys/types.h>  
 #include <unistd.h>  
+#include <langinfo.h>
 
 #include <libpq-fe.h>  
 
@@ -1929,7 +1930,9 @@ pgend_session_begin (Backend *backend,
          p = be->buff; *p =0;
          p = stpcpy (p, "CREATE DATABASE ");
          p = stpcpy (p, be->dbName);
-         p = stpcpy (p, ";");
+         p = stpcpy (p, " WITH ENCODING = '");
+	 p = stpcpy (p, nl_langinfo(CODESET));
+         p = stpcpy (p, "';");
          SEND_QUERY (be,be->buff, );
          FINISH_QUERY(be->connection);
          PQfinish (be->connection);