Index: pgDatabase.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgDatabase.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -Lsrc/schema/pgDatabase.cpp -Lsrc/schema/pgDatabase.cpp -u -w -r1.64 -r1.65
--- src/schema/pgDatabase.cpp
+++ src/schema/pgDatabase.cpp
@@ -267,7 +267,11 @@
             + wxT("-- DROP DATABASE ") + GetQuotedIdentifier() + wxT(";")
             + wxT("\n\nCREATE DATABASE ") + GetQuotedIdentifier()
             + wxT("\n  WITH OWNER = ") + qtIdent(GetOwner())
-            + wxT("\n       ENCODING = ") + qtString(GetEncoding()) + wxT(";\n");
+            + wxT("\n       ENCODING = ") + qtString(GetEncoding());
+        if (!tablespace.IsEmpty())
+            sql += wxT("\n       TABLESPACE = ") + qtIdent(GetTablespace());
+        
+        sql += wxT(";\n");
 
         size_t i;
         for (i=0 ; i < variables.GetCount() ; i++)