diff --git a/library/postgresql_db b/library/postgresql_db
index 09172beed6..327dd39108 100644
--- a/library/postgresql_db
+++ b/library/postgresql_db
@@ -124,7 +124,7 @@ def db_create(cursor, db, owner, template, encoding):
             template = " TEMPLATE \"%s\"" % template
         if encoding:
             encoding = " ENCODING '%s'" % encoding
-        query = "CREATE DATABASE %s%s%s%s" % (db, owner, template, encoding)
+        query = "CREATE DATABASE \"%s\"%s%s%s" % (db, owner, template, encoding)
         cursor.execute(query)
         return True
     elif owner and not db_owned_by(cursor, db, owner):