Index: /trunk/src/VBox/Main/include/DHCPServerImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/DHCPServerImpl.h	(revision 76189)
+++ /trunk/src/VBox/Main/include/DHCPServerImpl.h	(revision 76190)
@@ -51,4 +51,5 @@
     static const std::string kDsrKeyUpperIp;
     static const std::string kDsrKeyConfig;
+    static const std::string kDsrKeyComment;
 };
 
Index: /trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp	(revision 76189)
+++ /trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp	(revision 76190)
@@ -42,4 +42,5 @@
 const std::string DHCPServerRunner::kDsrKeyUpperIp = "--upper-ip";
 const std::string DHCPServerRunner::kDsrKeyConfig  = "--config";
+const std::string DHCPServerRunner::kDsrKeyComment = "--comment";
 
 
@@ -786,4 +787,5 @@
 
     m->dhcp.setOption(DHCPServerRunner::kDsrKeyConfig, m->tempConfigFileName);
+    m->dhcp.setOption(DHCPServerRunner::kDsrKeyComment, m->networkName.c_str());
 #else /* !VBOX_WITH_DHCPD */
     /* Main is needed for NATNetwork */
Index: /trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp	(revision 76189)
+++ /trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp	(revision 76190)
@@ -454,7 +454,9 @@
 
 
+#define DHCPD_GETOPT_COMMENT 256 /* No short option for --comment */
 static const RTGETOPTDEF g_aOptions[] =
 {
-    { "--config",       'c',    RTGETOPT_REQ_STRING },
+    { "--config",       'c',                  RTGETOPT_REQ_STRING },
+    { "--comment",      DHCPD_GETOPT_COMMENT, RTGETOPT_REQ_STRING }
 };
 
@@ -494,4 +496,11 @@
 
                 break;
+
+            case DHCPD_GETOPT_COMMENT: /* --comment */
+                /* The sole purpose of this option is to allow identification of DHCP
+                 * server instances in the process list. We ignore the required string
+                 * argument of this option.
+                 */
+                continue;
 
             case VINF_GETOPT_NOT_OPTION:
Index: /trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp	(revision 76189)
+++ /trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp	(revision 76190)
@@ -631,7 +631,9 @@
     ClientId::registerFormat();
 
+    /* XXX: We no longer need hardcoded and compat methods. We should remove them soon. */
     if (argc < 2)
         m_Config = Config::hardcoded();
-    else if (strcmp(argv[1], "--config") == 0)
+    else if (   strcmp(argv[1], "--config") == 0
+             || strcmp(argv[1], "--comment") == 0)
         m_Config = Config::create(argc, argv);
     else
