diff -purB ./grub/grub-core/bus/usb/usbhub.c ./grub_patched/grub-core/bus/usb/usbhub.c
--- ./grub/grub-core/bus/usb/usbhub.c	2011-06-25 19:48:11.000000000 +0200
+++ ./grub_patched/grub-core/bus/usb/usbhub.c	2011-06-25 20:30:56.000000000 +0200
@@ -44,7 +44,9 @@ static struct grub_usb_hub *hubs;
 /* Add a device that currently has device number 0 and resides on
    CONTROLLER, the Hub reported that the device speed is SPEED.  */
 static grub_usb_device_t
-grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
+grub_usb_hub_add_dev (grub_usb_controller_t controller,
+                      grub_usb_speed_t speed,
+                      int port, int hubaddr)
 {
   grub_usb_device_t dev;
   int i;
@@ -56,6 +58,8 @@ grub_usb_hub_add_dev (grub_usb_controlle
 
   dev->controller = *controller;
   dev->speed = speed;
+  dev->port = port;
+  dev->hubaddr = hubaddr;
 
   err = grub_usb_device_initialize (dev);
   if (err)
@@ -97,6 +101,11 @@ grub_usb_hub_add_dev (grub_usb_controlle
   dev->initialized = 1;
   grub_usb_devs[i] = dev;
 
+  grub_dprintf ("usb", "Added new usb device: %08x, addr=%d\n",
+    (grub_uint32_t)dev, i);
+  grub_dprintf ("usb", "speed=%d, port=%d, hubaddr=%d\n",
+    speed, port, hubaddr);
+
   /* Wait "recovery interval", spec. says 2ms */
   grub_millisleep (2);
   
@@ -218,7 +227,7 @@ attach_root_port (struct grub_usb_hub *h
   grub_millisleep (10);
 
   /* Enable the port and create a device.  */
-  dev = grub_usb_hub_add_dev (hub->controller, speed);
+  dev = grub_usb_hub_add_dev (hub->controller, speed, portno, 0);
   hub->controller->dev->pending_reset = 0;
   if (! dev)
     return;
@@ -353,7 +362,7 @@ poll_nonroot_hub (grub_usb_device_t dev)
 				  0, i, sizeof (status), (char *) &status);
 
       grub_dprintf ("usb", "dev = %p, i = %d, status = %08x\n",
-		    dev, i, status);
+                   dev, i, status);
 
       if (err)
 	continue;
@@ -472,7 +481,7 @@ poll_nonroot_hub (grub_usb_device_t dev)
 	      grub_millisleep (10);
 
 	      /* Add the device and assign a device address to it.  */
-	      next_dev = grub_usb_hub_add_dev (&dev->controller, speed);
+	      next_dev = grub_usb_hub_add_dev (&dev->controller, speed, i, dev->addr);
 	      dev->controller.dev->pending_reset = 0;
 	      if (! next_dev)
 		continue;
diff -purB ./grub/grub-core/Makefile.core.def ./grub_patched/grub-core/Makefile.core.def
--- ./grub/grub-core/Makefile.core.def	2011-06-25 19:48:11.000000000 +0200
+++ ./grub_patched/grub-core/Makefile.core.def	2011-06-25 20:21:14.000000000 +0200
@@ -435,6 +435,12 @@ module = {
 };
 
 module = {
+  name = ehci;
+  common = bus/usb/ehci.c;
+  enable = pci;
+};
+
+module = {
   name = pci;
   noemu = bus/pci.c;
   emu = bus/emu/pci.c;
diff -purB ./grub/include/grub/usb.h ./grub_patched/include/grub/usb.h
--- ./grub/include/grub/usb.h	2011-05-17 09:11:27.000000000 +0200
+++ ./grub_patched/include/grub/usb.h	2011-06-25 20:32:53.000000000 +0200
@@ -198,6 +198,11 @@ struct grub_usb_device
   grub_uint32_t statuschange;
 
   struct grub_usb_desc_endp *hub_endpoint;
+
+  /* EHCI Split Transfer information */
+  int port;
+
+  int hubaddr;
 };