diff --git a/modules/hosting/site/hosting_site.drush.inc b/modules/hosting/site/hosting_site.drush.inc
index 090edc3..52b3007 100644
--- a/modules/hosting/site/hosting_site.drush.inc
+++ b/modules/hosting/site/hosting_site.drush.inc
@@ -195,6 +195,7 @@ function hosting_site_post_hosting_verify_task($task, $data) {
     $task->ref->no_verify = TRUE;
     if ($data['context']['cron_key']) {
       $task->ref->cron_key = $data['context']['cron_key'];
+      $task->ref->db_name = $data['self']['db_name'];
     }
     node_save($task->ref);
 
diff --git a/modules/hosting/site/hosting_site.install b/modules/hosting/site/hosting_site.install
index 77b015d..1fa005a 100644
--- a/modules/hosting/site/hosting_site.install
+++ b/modules/hosting/site/hosting_site.install
@@ -30,6 +30,12 @@ function hosting_site_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
+      'db_name' => array(
+        'type' => 'varchar',
+        'length' => 64,
+        'not null' => TRUE,
+        'default' => '',
+      ),
       'platform' => array(
         'type' => 'int',
         'not null' => TRUE,
@@ -314,3 +320,14 @@ function hosting_site_update_6201() {
 
   return $ret;
 }
+
+/**
+ * Add 'db_name' column to 'hosting_site' table.
+ */
+function hosting_site_update_6202() {
+  $ret = array();
+  db_add_field($ret, 'hosting_site', 'db_name',
+      array('type' => 'varchar', 'length' => 64, 'not null' => TRUE, 'default' => ''));
+
+  return $ret;
+}
diff --git a/modules/hosting/site/hosting_site.nodeapi.inc b/modules/hosting/site/hosting_site.nodeapi.inc
index 3f44a3c..2f5180d 100644
--- a/modules/hosting/site/hosting_site.nodeapi.inc
+++ b/modules/hosting/site/hosting_site.nodeapi.inc
@@ -67,6 +67,15 @@ function hosting_site_view(&$node, $teaser = false) {
       '#value' => _hosting_language_name($node->site_language),
     );
   }
+
+  if ($node->nid) {
+    $node->content['info']['status'] = array(
+      '#type' => 'item',
+      '#title' => t('Status'),
+      '#value' => _hosting_site_status($node),
+    );
+  }
+
   if ($node->db_server) {
     $node->content['info']['db_server'] = array(
       '#type' => 'item',
@@ -75,11 +84,11 @@ function hosting_site_view(&$node, $teaser = false) {
     );
   }
 
-  if ($node->nid) { 
-    $node->content['info']['status'] = array(
+  if ($node->db_name) {
+    $node->content['info']['db_name'] = array(
       '#type' => 'item',
-      '#title' => t('Status'),
-      '#value' => _hosting_site_status($node),
+      '#title' => t('Database name'),
+      '#value' => check_plain($node->db_name),
     );
   }
 
@@ -143,8 +152,8 @@ function hosting_site_insert(&$node) {
   // Ensure that the last_cron value is set.
   $node->last_cron = isset($node->last_cron) ? $node->last_cron : 0;
 
-  db_query("INSERT INTO {hosting_site} (vid, nid, client, db_server, platform, profile, language, last_cron, cron_key, status, verified) VALUES (%d, %d, %d, %d, %d, %d, '%s', %d, '%s', %d, %d)",
-           $node->vid, $node->nid, $node->client, $node->db_server, $node->platform, $node->profile, $node->site_language, $node->last_cron, $node->cron_key, $node->site_status, $node->verified);
+  db_query("INSERT INTO {hosting_site} (vid, nid, client, db_server, db_name, platform, profile, language, last_cron, cron_key, status, verified) VALUES (%d, %d, %d, %d, '%s', %d, %d, '%s', %d, '%s', %d, %d)",
+           $node->vid, $node->nid, $node->client, $node->db_server, $node->db_name, $node->platform, $node->profile, $node->site_language, $node->last_cron, $node->cron_key, $node->site_status, $node->verified);
   if ((empty($node->old_vid))) {
     hosting_context_register($node->nid, ($node->hosting_name) ? $node->hosting_name : $node->title);
     if ($node->import) {
@@ -171,8 +180,8 @@ function hosting_site_update(&$node) {
       $node->no_verify = TRUE;
     }
 
-    db_query("UPDATE {hosting_site} SET client = %d, db_server = %d, platform = %d, last_cron = %d, cron_key = '%s', status = %d, profile = %d, language = '%s', verified = %d WHERE vid=%d",
-             $node->client, $node->db_server, $node->platform, $node->last_cron, $node->cron_key, $node->site_status, $node->profile, $node->site_language, $node->verified, $node->vid);
+    db_query("UPDATE {hosting_site} SET client = %d, db_server = %d, db_name = '%s', platform = %d, last_cron = %d, cron_key = '%s', status = %d, profile = %d, language = '%s', verified = %d WHERE vid=%d",
+             $node->client, $node->db_server, $node->db_name, $node->platform, $node->last_cron, $node->cron_key, $node->site_status, $node->profile, $node->site_language, $node->verified, $node->vid);
   }
   if (!$node->no_verify) {
     hosting_add_task($node->nid, 'verify');
@@ -186,6 +195,6 @@ function hosting_site_update(&$node) {
  *    Node object
  */
 function hosting_site_load($node) {
-  $additions = db_fetch_object(db_query('SELECT  client, db_server, platform, profile, language as site_language, last_cron, cron_key, status AS site_status, verified FROM {hosting_site} WHERE vid = %d', $node->vid));
+  $additions = db_fetch_object(db_query('SELECT client, db_server, db_name, platform, profile, language as site_language, last_cron, cron_key, status AS site_status, verified FROM {hosting_site} WHERE vid = %d', $node->vid));
   return $additions;
 }