Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.435
diff -u -r1.435 system.module
--- modules/system/system.module	2 Jan 2007 05:05:38 -0000	1.435
+++ modules/system/system.module	5 Jan 2007 15:42:59 -0000
@@ -860,8 +860,8 @@
   $form['site_offline_message'] = array(
     '#type' => 'textarea',
     '#title' => t('Site off-line message'),
-    '#default_value' => variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))),
-    '#description' => t('Message to show visitors when the site is in off-line mode.')
+    '#default_value' => variable_get('site_offline_message', t('!site is currently under maintenance. We should be back shortly. Thank you for your patience.')),
+    '#description' => t('Message to show visitors when the site is in off-line mode.') .' '. t('Available variables are:') .' !site, !uri, !uri_brief, !mailto, !date.'
   );
 
   return system_settings_form($form);
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.609
diff -u -r1.609 common.inc
--- includes/common.inc	5 Jan 2007 05:32:22 -0000	1.609
+++ includes/common.inc	5 Jan 2007 15:42:58 -0000
@@ -320,10 +320,20 @@
  * Generates a site off-line message
  */
 function drupal_site_offline() {
+  global $base_url;
+
   drupal_set_header('HTTP/1.1 503 Service unavailable');
   drupal_set_title(t('Site off-line'));
-  print theme('maintenance_page', filter_xss_admin(variable_get('site_offline_message',
-    t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))));
+  $variables = array(
+    '!site' => variable_get('site_name', 'Drupal'),
+    '!uri' => $base_url,
+    '!uri_brief' => substr($base_url, strlen('http://')),
+    '!mailto' => variable_get('site_mail', ini_get('sendmail_from')),
+    '!date' => format_date(time()),
+  );
+
+  $site_offline_message = variable_get('site_offline_message', t('!site is currently under maintenance. We should be back shortly. Thank you for your patience.'));
+  print theme('maintenance_page', strtr(filter_xss_admin($site_offline_message), $variables));
 }
 
 /**