diff --git a/README.md b/README.md
index d4b6a15..56bd93f 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,3 @@ to the container:
             - POSTGRES_MULTIPLE_DATABASES: db1,db2
             - POSTGRES_USER: myapp
             - POSTGRES_PASSWORD:
-
-### Non-standard database names
-
-If you need to use non-standard database names (hyphens, uppercase letters etc), quote them in `POSTGRES_MULTIPLE_DATABASES`:
-
-        environment:
-            - POSTGRES_MULTIPLE_DATABASES: "test-db-1","test-db-2"
diff --git a/create-multiple-postgresql-databases.sh b/create-multiple-postgresql-databases.sh
index aa665fa..fc34c23 100755
--- a/create-multiple-postgresql-databases.sh
+++ b/create-multiple-postgresql-databases.sh
@@ -7,9 +7,9 @@ function create_user_and_database() {
 	local database=$1
 	echo "  Creating user and database '$database'"
 	psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
-	    CREATE USER $database;
-	    CREATE DATABASE $database;
-	    GRANT ALL PRIVILEGES ON DATABASE $database TO $database;
+	    CREATE USER "$database";
+	    CREATE DATABASE "$database";
+	    GRANT ALL PRIVILEGES ON DATABASE "$database" TO "$database";
 EOSQL
 }