diff --git a/buildout/development.cfg b/buildout/development.cfg
index d1735c5a6e4e783e44dd3e51901fd80eacb70cc9..b9b6d814f8c9e2c9ff987de929172e74e13550a0 100644
--- a/buildout/development.cfg
+++ b/buildout/development.cfg
@@ -27,7 +27,9 @@ products += ${products-development:location}
 # Format:
 #     database[@host[:port]] [user [password [unix_socket]]]
 #   e.g "erp5db erp5user somepassword" or "erp5db erp5user"
-erp5_sql_connection_string =  test@${configuration:mysql_host}:${configuration:mysql_port} root
+mysql_database_name = development_site
+
+erp5_sql_connection_string = ${:mysql_database_name}@${configuration:mysql_host}:${configuration:mysql_port} root
 bt5 =
    erp5_base
    erp5_forge
diff --git a/buildout/zope-instance/buildout.cfg b/buildout/zope-instance/buildout.cfg
index 4fe565d31a4d69f60852bde08d2c1973d8f5fcf4..67c90f96e89a43db17f3842d3cd3f9b3b67fab6a 100644
--- a/buildout/zope-instance/buildout.cfg
+++ b/buildout/zope-instance/buildout.cfg
@@ -36,7 +36,14 @@ products =
   ${products-erp5:location}
   ${products-other:location}
 
+[create_mysql_database]
+# XXX: This have to be converted into recipe
+recipe = plone.recipe.command
+command =
+  echo "CREATE DATABASE IF NOT EXISTS ${create_erp5_site:mysql_database_name}" | ${buildout:bin-directory}/mysql -u root
+
 [create_erp5_site]
+depends = ${create_mysql_database:command}
 recipe = erp5.recipe.createsite
 portal_id = erp5
 control-script = ${zope-instance:control-script}