Index: server/scoreboard.c
===================================================================
--- server/scoreboard.c	(revision 798301)
+++ server/scoreboard.c	(working copy)
@@ -39,6 +39,7 @@
 AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL;
 AP_DECLARE_DATA const char *ap_scoreboard_fname = NULL;
 AP_DECLARE_DATA int ap_extended_status = 0;
+AP_DECLARE_DATA int ap_scoreboard_display_hostname = 0;
 AP_DECLARE_DATA int ap_mod_status_reqtail = 0;
 
 #if APR_HAS_SHARED_MEMORY
@@ -472,8 +473,14 @@
             apr_cpystrn(ws->client, ap_get_remote_host(c, r->per_dir_config,
                         REMOTE_NOLOOKUP, NULL), sizeof(ws->client));
             copy_request(ws->request, sizeof(ws->request), r);
-            apr_cpystrn(ws->vhost, r->server->server_hostname,
+            if (ap_scoreboard_display_hostname == 0) {
+                apr_cpystrn(ws->vhost, r->server->server_hostname,
                         sizeof(ws->vhost));
+            }
+            else {
+                apr_cpystrn(ws->vhost, r->hostname == NULL ? r->server->server_hostname : r->hostname,
+                        sizeof(ws->vhost));
+            }
         }
     }
 
Index: modules/generators/mod_status.c
===================================================================
--- modules/generators/mod_status.c	(revision 798301)
+++ modules/generators/mod_status.c	(working copy)
@@ -116,6 +116,16 @@
     return NULL;
 }
 
+static const char *set_scoreboard_display_hostname(cmd_parms *cmd, void *dummy, int arg)
+{
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+    if (err != NULL) {
+        return err;
+    }
+    ap_scoreboard_display_hostname = arg;
+    return NULL;
+}
+
 static const char *set_reqtail(cmd_parms *cmd, void *dummy, int arg)
 {
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -131,6 +141,8 @@
 {
     AP_INIT_FLAG("ExtendedStatus", set_extended_status, NULL, RSRC_CONF,
       "\"On\" to enable extended status information, \"Off\" to disable"),
+    AP_INIT_FLAG("ScoreBoardDisplayHostname", set_scoreboard_display_hostname, NULL, RSRC_CONF,
+      "\"On\" to enable displaying the Hostname that was requested instead of ServerName in the scoreboards VHost field, \"Off\" to disable"),
     AP_INIT_FLAG("SeeRequestTail", set_reqtail, NULL, RSRC_CONF,
       "For verbose requests, \"On\" to see the last 63 chars of the request, "
       "\"Off\" (default) to see the first 63 in extended status display"),
Index: include/scoreboard.h
===================================================================
--- include/scoreboard.h	(revision 798301)
+++ include/scoreboard.h	(working copy)
@@ -185,6 +185,7 @@
 AP_DECLARE_DATA extern scoreboard *ap_scoreboard_image;
 AP_DECLARE_DATA extern const char *ap_scoreboard_fname;
 AP_DECLARE_DATA extern int ap_extended_status;
+AP_DECLARE_DATA extern int ap_scoreboard_display_hostname;
 AP_DECLARE_DATA extern int ap_mod_status_reqtail;
 
 AP_DECLARE_DATA extern ap_generation_t volatile ap_my_generation;