diff --git a/bochs/.bochsrc b/bochs/.bochsrc
index 3ced88839..73ac5d5e4 100644
--- a/bochs/.bochsrc
+++ b/bochs/.bochsrc
@@ -549,9 +549,9 @@ keyboard_paste_delay: 100000
 # mouse button on X11, SDL, wxWidgets and Win32).
 # With the mouse type option you can select the type of mouse to emulate.
 # The default value is 'ps2'. The other choices are 'imps2' (wheel mouse
-# on PS/2), 'serial', 'serial_wheel', 'serial_msys' (one com port requires
-# setting 'mode=mouse') and 'usb' (3-button mouse - one of the USB ports must
-# be connected with the 'mouse' device - requires PCI and USB support).
+# on PS/2), 'serial', 'serial_wheel' and 'serial_msys' (one com port requires
+# setting 'mode=mouse'). To connect a mouse to an USB port, see the 'usb1'
+# option (requires PCI and USB support).
 #
 # Examples:
 #   mouse: enabled=1
diff --git a/bochs/CHANGES b/bochs/CHANGES
index 06ba8c68e..f04949bb1 100644
--- a/bochs/CHANGES
+++ b/bochs/CHANGES
@@ -21,10 +21,19 @@ Changes after 2.3 release:
     to enable Intel Core Duo 2 new instructions use --enable-sse3e
 
 - I/O devices (Volker)
-  - initial support for the PIIX4 ACPI controller
-  - hard disk emulation now supports ATA-6 (LBA48 addressing, UDMA modes)
-  - VMWare version 4 disk image support added (patch by Sharvil Nanavati)
-  - experimental USB device change support added
+  - Floppy
+    - partial non-DMA mode support (patch by John Comeau)
+  - Hard drive / cdrom
+    - hard disk emulation now supports ATA-6 (LBA48 addressing, UDMA modes)
+    - VMWare version 4 disk image support added (patch by Sharvil Nanavati)
+  - PCI
+    - initial support for the PIIX4 ACPI controller
+  - Serial
+    - added support for 3-button mouse with Mousesystems protocol
+  - USB
+    - experimental USB device change support added
+    - rewrite of the existing USB devices code
+    - new USB devices 'disk' and 'tablet' (ported from the Qemu project)
 
 - Bochs internal debugger
   - fixed broken debugger "rc file" option (execute debugger command from file)
diff --git a/bochs/config.cc b/bochs/config.cc
index 5df50d53a..3089ea239 100755
--- a/bochs/config.cc
+++ b/bochs/config.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: config.cc,v 1.116 2007-03-18 22:27:37 sshwarts Exp $
+// $Id: config.cc,v 1.117 2007-03-27 17:47:14 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -804,9 +804,6 @@ void bx_init_options()
     "imps2",
 #if BX_SUPPORT_BUSMOUSE
     "bus",
-#endif
-#if BX_SUPPORT_PCIUSB
-    "usb",
 #endif
     "serial",
     "serial_wheel",
@@ -818,9 +815,6 @@ void bx_init_options()
       "The mouse type can be one of these: 'none', 'ps2', 'imps2', 'serial', 'serial_wheel'"
 #if BX_SUPPORT_BUSMOUSE
       ", 'bus'"
-#endif
-#if BX_SUPPORT_PCIUSB
-      ", 'usb'"
 #endif
       ,
       mouse_type_list,
diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk
index 2d5929b46..059e5421e 100644
--- a/bochs/doc/docbook/user/user.dbk
+++ b/bochs/doc/docbook/user/user.dbk
@@ -1,7 +1,7 @@
 <!--
 ================================================================
 doc/docbook/user/user.dbk
-$Id: user.dbk,v 1.222 2006-12-28 17:06:37 vruppert Exp $
+$Id: user.dbk,v 1.223 2007-03-27 17:47:14 vruppert Exp $
 
 This is the top level file for the Bochs Users Manual.
 ================================================================
@@ -426,7 +426,7 @@ currently work with.
   <row>
     <entry>Hard disk</entry>
     <entry>Yes</entry>
-    <entry>Emulates ATA-2/IDE hard drives via image files.  Physical
+    <entry>Emulates ATA-6/IDE hard drives via image files.  Physical
     hard disk access is supported on some architecture, but NOT recommended, primarily for safety reasons.
     Hard disk up to 127GB are supported, on any platform that support large files access.
     </entry>
@@ -513,9 +513,9 @@ currently work with.
   <row>
     <entry>USB</entry>
     <entry>incomplete</entry>
-    <entry>The USB root hub is available, USB mouse and keypad are implemented,
-    other devices are under construction. Access to real hardware and runtime
-    options to plug in or remove devices are not implemented yet.
+    <entry>The USB root hub and the devices 'mouse', 'tablet', 'keypad' and
+    'disk' are available. Plug in or removing devices at runtime is possible,
+    but still experimental. Access to real hardware is not implemented yet.
     </entry>
   </row>
   <row>
@@ -2317,7 +2317,8 @@ turn it off.
       <entry>--enable-usb</entry>
       <entry>no</entry>
       <entry>
-        Enable limited i440FX PCI USB support. This is not yet complete.
+        Enable limited i440FX PCI USB support. This is not yet complete (root hub
+        and 4 device types are available).
       </entry>
     </row>
     <row>
@@ -3275,7 +3276,7 @@ This defines the type and characteristics of all attached ata devices:
 <row> 
   <entry> mode  </entry> 
   <entry> image type, only valid for disks </entry> 
-  <entry> [flat | concat | external | dll | sparse | vmware3 | undoable | growing | volatile ]</entry> 
+  <entry> [flat | concat | external | dll | sparse | vmware3 | vmware4 | undoable | growing | volatile ]</entry> 
 </row>
 <row> <entry> cylinders </entry> <entry> only valid for disks </entry> </row>
 <row> <entry> heads </entry> <entry> only valid for disks </entry> </row>
@@ -3356,7 +3357,10 @@ dll : developer's specific, through a DLL
 sparse : stackable, commitable, rollbackable
 </para></listitem>
 <listitem><para>
-vmware3 : vmware3 disk support
+vmware3 : vmware version 3 disk support
+</para></listitem>
+<listitem><para>
+vmware4 : vmware version 4 disk support
 </para></listitem>
 <listitem><para>
 undoable : flat file with commitable redolog
@@ -3874,11 +3878,10 @@ mouse usage at runtime (see <link linkend="headerbar">headerbar</link>).
 <para>
   With the mouse type option you can select the type of mouse to emulate.
   The default value is 'ps2'. The other choices are 'imps2' (wheel mouse
-  on PS/2), 'serial', 'serial_wheel' (one com port requires setting
-  'mode=mouse', see <link linkend="bochsopt-com">com option</link>) and
-  'usb' (3-button mouse - one of the USB ports must be connected with the
-  'mouse' device, see <link linkend="bochsopt-usb1">usb1 option</link> -
-  requires PCI and USB support).
+  on PS/2), 'serial', 'serial_wheel' and 'serial_msys' (one com port requires
+  setting 'mode=mouse', see <link linkend="bochsopt-com">com option</link>).
+  To connect a mouse to an USB port, see the <link linkend="bochsopt-usb1">usb1 option</link>
+  (requires PCI and USB support).
 </para>
 </section>
 
@@ -3937,18 +3940,23 @@ located in the <constant>bochs/host/linux/pcidev/</constant> directory.
 
 <section id="bochsopt-usb1"><title>usb1</title>
 <para>
-Example:
+Examples:
 <screen>
   usb1: enabled=1, port1=mouse, port2=keypad
+  usb1: enabled=1, port1=tablet, port2=disk:usbdisk.img
 </screen>
 This option controls the presence of the USB root hub which is a part of the
 i440FX PCI chipset.
 </para>
 <para>
 With the port<replaceable>X</replaceable> option you can connect devices
-to the hub (currently supported: 'mouse' and 'keypad'). If you connect
-the mouse to one of the ports and use the <link linkend="bochsopt-mouse">mouse option</link>
-'type=usb' you'll have a 3-button USB mouse.
+to the hub (currently supported: 'mouse', 'tablet', 'keypad' and 'disk').
+If you connect the mouse or tablet to one of the ports, Bochs forwards the
+mouse movement data to the USB device instead of the selected mouse type.
+When connecting the keypad to one of the ports, Bochs forwards the input of
+the numeric keypad to the USB device instead of the PS/2 keyboard.
+To connect a flat image as an USB hardisk you can use the 'disk' device with
+the path to the image separated with a colon (see above).
 </para>
 <note><para>
 PCI support must be enabled.
@@ -7202,7 +7210,12 @@ If unspecified, the default "mode" is flat.
  </row>
  <row> <entry> vmware3 </entry> <entry> vmware3 disk support </entry> 
        <entry> 
-       vmware3 compatibility
+       vmware version 3 compatibility
+       </entry>
+ </row>
+ <row> <entry> vmware4 </entry> <entry> vmware4 disk support </entry> 
+       <entry> 
+       vmware version 4 compatibility
        </entry>
  </row>
  <row> <entry> undoable </entry> <entry> flat file with a commitable redolog </entry> 
@@ -7489,40 +7502,40 @@ No external tool support Sparse disk images yet.
 </section>
 </section>
 
-<section><title>vmware3</title>
+<section><title>vmware3/vmware4</title>
 <para>
 </para>
 <section><title>description</title>
 <para>
-Sharvil Nanavati has added vmware3 disk image support into Bochs
+Sharvil Nanavati has added vmware3/4 disk image support into Bochs
 for Net Integration Technologies, Inc. 
-You should be able to use disk images created by vmware3.
+You should be able to use disk images created by vmware version 3 and 4.
 </para>
 </section>
 <section><title>image creation</title>
 <para>
-Create such disk image with vmware3.
+Create such disk image with vmware version 3 or 4.
 </para>
 </section>
 <section><title>path</title>
 <para>
 The "path" option of the ataX-xxx directive in the configuration file
-must point to the vmware3 disk image.
+must point to the vmware3/4 disk image.
 </para>
 </section>
 <section><title>external tools</title>
 <para>
-&FIXME; give a look at vmware3 tools : disk image creation, etc.
+&FIXME; give a look at vmware3/4 tools : disk image creation, etc.
 </para>
 </section>
 <section><title>typical use</title>
 <para>
-If you want to use an existing vmware3 disk image.
+If you want to use an existing vmware3/4 disk image.
 </para>
 </section>
 <section><title>limitations</title>
 <para>
-Only vmware version 3 disk image files are supported.
+Only vmware versions 3 and 4 disk image files are supported.
 </para>
 </section>
 </section>
diff --git a/bochs/gui/siminterface.h b/bochs/gui/siminterface.h
index 50e8114a1..7ea660959 100644
--- a/bochs/gui/siminterface.h
+++ b/bochs/gui/siminterface.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: siminterface.h,v 1.207 2007-03-18 17:52:15 vruppert Exp $
+// $Id: siminterface.h,v 1.208 2007-03-27 17:47:14 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // Intro to siminterface by Bryce Denney:
@@ -995,9 +995,6 @@ enum {
   BX_MOUSE_TYPE_IMPS2,
 #if BX_SUPPORT_BUSMOUSE
   BX_MOUSE_TYPE_BUS,
-#endif
-#if BX_SUPPORT_PCIUSB
-  BX_MOUSE_TYPE_USB,
 #endif
   BX_MOUSE_TYPE_SERIAL,
   BX_MOUSE_TYPE_SERIAL_WHEEL,
diff --git a/bochs/iodev/pciusb.cc b/bochs/iodev/pciusb.cc
index f0857402e..be651bb97 100644
--- a/bochs/iodev/pciusb.cc
+++ b/bochs/iodev/pciusb.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pciusb.cc,v 1.54 2007-03-25 17:37:59 vruppert Exp $
+// $Id: pciusb.cc,v 1.55 2007-03-27 17:47:15 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -26,7 +26,6 @@
 
 // Experimental PCI USB adapter
 // Benjamin D Lunt (fys at frontiernet net) coded most of this usb emulation.
-// USB mass storage device support and SCSI emulation layer ported from Qemu
 
 /* Notes:
    - I have coded this to be able to use more than one HUB and each
@@ -261,7 +260,6 @@ void bx_pciusb_c::reset(unsigned type)
       BX_USB_THIS hub[i].usb_port[j].enabled = 0;
       BX_USB_THIS hub[i].usb_port[j].able_changed = 0;
       BX_USB_THIS hub[i].usb_port[j].status = 0;
-      BX_USB_THIS hub[i].usb_port[j].device_num = -1;
       if (BX_USB_THIS hub[i].usb_port[j].device != NULL) {
         delete BX_USB_THIS hub[i].usb_port[j].device;
         BX_USB_THIS hub[i].usb_port[j].device = NULL;
diff --git a/bochs/iodev/pciusb.h b/bochs/iodev/pciusb.h
index 1908fdf4c..82e67853b 100644
--- a/bochs/iodev/pciusb.h
+++ b/bochs/iodev/pciusb.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: pciusb.h,v 1.25 2007-03-25 17:37:59 vruppert Exp $
+// $Id: pciusb.h,v 1.26 2007-03-27 17:47:15 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2004  MandrakeSoft S.A.
@@ -25,7 +25,6 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
 // Benjamin D Lunt (fys at frontiernet net) coded most of this usb emulation.
-// USB mass storage device support and SCSI emulation layer ported from Qemu
 
 #ifndef BX_IODEV_PCIUSB_H
 #define BX_IODEV_PCIUSB_H
@@ -128,15 +127,6 @@ struct USBPacket {
   int len;
 };
 
-// setup packets
-struct REQUEST_PACKET {
-  Bit8u  request_type;
-  Bit8u  request;
-  Bit16u value;
-  Bit16u index;
-  Bit16u length;
-};
-
 enum usbdev_type {
   USB_DEV_TYPE_NONE=0,
   USB_DEV_TYPE_MOUSE,
@@ -294,7 +284,6 @@ typedef struct {
   //  Can only write in WORD sizes (Read in byte sizes???)
   struct {
     // our data
-    int     device_num;     // device number on this hub
     usb_device_t *device;   // device connected to this port
 
     // bit reps of actual port
diff --git a/bochs/iodev/usb_hid.cc b/bochs/iodev/usb_hid.cc
index 81168e8b2..6d3278ec3 100644
--- a/bochs/iodev/usb_hid.cc
+++ b/bochs/iodev/usb_hid.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: usb_hid.cc,v 1.3 2007-03-25 17:37:59 vruppert Exp $
+// $Id: usb_hid.cc,v 1.4 2007-03-27 17:47:15 vruppert Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2007  Volker Ruppert
@@ -18,7 +18,8 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-// USB HID emulation support ported from the Qemu project
+// USB HID emulation support (mouse and tablet) ported from the Qemu project
+// USB keypad emulation based on code by Benjamin D Lunt (fys at frontiernet net)
 
 
 // Define BX_PLUGGABLE in files that can be compiled into plugins.  For