Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 57624)
+++ /trunk/Config.kmk	(revision 57625)
@@ -552,5 +552,5 @@
 endif
 # Whether to generate a database of USB vendor IDs and device IDs into VBoxSVC.
-#VBOX_WITH_MAIN_USB_ID_DATABASE = 1
+VBOX_WITH_MAIN_USB_ID_DATABASE = 1
 # The recompiler.
 VBOX_WITH_REM = 1
Index: /trunk/src/VBox/Main/src-server/USBIdDatabaseGenerator.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/USBIdDatabaseGenerator.cpp	(revision 57624)
+++ /trunk/src/VBox/Main/src-server/USBIdDatabaseGenerator.cpp	(revision 57625)
@@ -54,5 +54,5 @@
 const size_t AliasDictionary::vendors_size = sizeof(AliasDictionary::vendorArray) / sizeof(Vendor);";
 
-const char* start_block = "#            interface  interface_name               <-- two tabs";
+const char* start_block = "# Vendors, devices and interfaces. Please keep sorted.";
 const char* end_block = "# List of known device classes, subclasses and protocols";
 
@@ -111,5 +111,5 @@
         }
     }
-    return res;
+  return res;
 }
 
Index: /trunk/src/VBox/Main/src-server/custom.ids
===================================================================
--- /trunk/src/VBox/Main/src-server/custom.ids	(revision 57624)
+++ /trunk/src/VBox/Main/src-server/custom.ids	(revision 57625)
@@ -1,3 +1,3 @@
-# Vendors, devices
+# Vendors, devices and interfaces. Please keep sorted.
 
 # Syntax: