Index: includes/bootstrap.inc
===================================================================
--- includes/bootstrap.inc	(revision 1442)
+++ includes/bootstrap.inc	(working copy)
@@ -1623,6 +1623,8 @@
       'referer'     => isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '',
       'ip'          => ip_address(),
       'timestamp'   => REQUEST_TIME,
+      'server_addr' => isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '',
+      'server_name' => isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '',
     );
 
     // Call the logging hooks to log/process the message
Index: modules/dblog/dblog.admin.inc
===================================================================
--- modules/dblog/dblog.admin.inc	(revision 1442)
+++ modules/dblog/dblog.admin.inc	(working copy)
@@ -35,13 +35,14 @@
     array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'),
     t('Message'),
     array('data' => t('User'), 'field' => 'u.name'),
+    array('data' => t('Server'), 'field' => 'w.server_addr'),
     array('data' => t('Operations')),
   );
 
   $query = db_select('watchdog', 'w')->extend('PagerDefault')->extend('TableSort');
   $query->leftJoin('users', 'u', 'w.uid = u.uid');
   $query
-    ->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link'))
+    ->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link', 'server_addr', 'server_name'))
     ->addField('u', 'name');
   if (!empty($filter['where'])) {
     $query->where($filter['where'], $filter['args']);
@@ -60,6 +61,7 @@
         format_date($dblog->timestamp, 'short'),
         theme('dblog_message', array('event' => $dblog, 'link' => TRUE)),
         theme('username', array('account' => $dblog)),
+        $dblog->server_addr . ' (' . $dblog->server_name. ')',
         $dblog->link,
       ),
       // Attributes for tr
@@ -166,6 +168,14 @@
         check_plain($dblog->hostname),
       ),
       array(
+        array('data' => t('Server IP'), 'header' => TRUE),
+        $dblog->server_addr,
+      ),
+      array(
+        array('data' => t('Server Name'), 'header' => TRUE),
+        $dblog->server_name,
+      ),
+      array(
         array('data' => t('Operations'), 'header' => TRUE),
         $dblog->link,
       ),
Index: modules/dblog/dblog.install
===================================================================
--- modules/dblog/dblog.install	(revision 1442)
+++ modules/dblog/dblog.install	(working copy)
@@ -81,6 +81,20 @@
         'default' => 0,
         'description' => 'Unix timestamp of when event occurred.',
       ),
+      'server_addr' => array(
+        'type' => 'varchar',
+        'length' => 128,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => 'IP address of the server who triggered the event.',
+      ),
+      'server_name' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+        'description' => 'Name of the server who triggered the event.',
+      ),
     ),
     'primary key' => array('wid'),
     'indexes' => array(
@@ -134,3 +148,11 @@
 /**
  * @} End of "addtogroup updates-6.x-to-7.x"
  */
+
+/**
+ * Add new fields server_addr and server_name.
+ */
+function dblog_update_7002() {
+  db_add_field('watchdog', 'server_addr', array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => '', 'description' => 'IP address of the server who triggered the event.', 'initial' => ''));
+  db_add_field('watchdog', 'server_name', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', 'description' => 'Name of the server who triggered the event.', 'initial' => ''));
+}
Index: modules/dblog/dblog.module
===================================================================
--- modules/dblog/dblog.module	(revision 1442)
+++ modules/dblog/dblog.module	(working copy)
@@ -151,6 +151,8 @@
       'referer' => $log_entry['referer'],
       'hostname' => substr($log_entry['ip'], 0, 128),
       'timestamp' => $log_entry['timestamp'],
+      'server_addr' => $log_entry['server_addr'],
+      'server_name' => $log_entry['server_name'],
     ))
     ->execute();
 }
Index: modules/syslog/syslog.module
===================================================================
--- modules/syslog/syslog.module	(revision 1442)
+++ modules/syslog/syslog.module	(working copy)
@@ -94,8 +94,10 @@
     openlog(variable_get('syslog_identity', 'drupal'), LOG_NDELAY, variable_get('syslog_facility', $default_facility));
   }
 
-  $message = strtr(variable_get('syslog_format', '!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message'), array(
+  $message = strtr(variable_get('syslog_format', '!base_url|!server_addr|!server_name|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message'), array(
     '!base_url'    => $base_url,
+    '!server_addr' => $log_entry['server_addr'],
+    '!server_name' => $log_entry['server_name'],
     '!timestamp'   => $log_entry['timestamp'],
     '!type'        => $log_entry['type'],
     '!ip'          => $log_entry['ip'],
Index: modules/system/system.api.php
===================================================================
--- modules/system/system.api.php	(revision 1442)
+++ modules/system/system.api.php	(working copy)
@@ -2191,6 +2191,8 @@
  *
  * @param $log_entry
  *   An associative array containing the following keys:
+ *   - server_addr: The ip address of the server this watchdog entry has been created.
+ *   - server_name: The name of the server this watchdog entry has been created.
  *   - type: The type of message for this entry. For contributed modules, this is
  *     normally the module name. Do not use 'debug', use severity WATCHDOG_DEBUG instead.
  *   - user: The user object for the user who was logged in when the event happened.
@@ -2232,6 +2234,7 @@
   ));
 
   $params['message']  = "\nSite:         @base_url";
+  $params['message']  = "\nServer:       @server_addr (@server_name)";
   $params['message'] .= "\nSeverity:     (@severity) @severity_desc";
   $params['message'] .= "\nTimestamp:    @timestamp";
   $params['message'] .= "\nType:         @type";
@@ -2244,6 +2247,8 @@
 
   $params['message'] = t($params['message'], array(
     '@base_url'      => $base_url,
+    '@server_addr'   => $log_entry['server_addr'],
+    '@server_name'   => $log_entry['server_name'],
     '@severity'      => $log_entry['severity'],
     '@severity_desc' => $severity_list[$log_entry['severity']],
     '@timestamp'     => format_date($log_entry['timestamp']),