diff --git a/bochs/.bochsrc b/bochs/.bochsrc
index 4ed9b53a4..cc23f5bd8 100644
--- a/bochs/.bochsrc
+++ b/bochs/.bochsrc
@@ -13,7 +13,7 @@
 #
 # These plugins are also supported, but they are usually loaded directly with
 # their bochsrc option: 'e1000', 'es1370', 'ne2k', 'pcidev', 'pcipnic', 'sb16',
-# 'usb_ohci', 'usb_uhci', 'usb_xhci' and 'voodoo'.
+# 'usb_ehci', 'usb_ohci', 'usb_uhci', 'usb_xhci' and 'voodoo'.
 #=======================================================================
 #plugin_ctrl: unmapped=0, e1000=1 # unload 'unmapped' and load 'e1000'
 
@@ -489,8 +489,8 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
 #  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') 'inport' and 'bus' (if present). To connect a mouse
-#  to a USB port, see the 'usb_uhci', 'usb_ohci' or 'usb_xhci' options
-#  (requires PCI and USB support).
+#  to a USB port, see the 'usb_uhci', 'usb_ohci', 'usb_ehci' or 'usb_xhci'
+#  options (requires PCI and USB support).
 #
 #  ENABLED:
 #  The Bochs gui creates mouse "events" unless the 'enabled' option is
@@ -521,7 +521,7 @@ mouse: enabled=0
 # devices assigning to slot is mandatory if you want to emulate the PCI model:
 # cirrus, ne2k and pcivga. These PCI-only devices are also supported, but they
 # are auto-assigned if you don't use the slot configuration: e1000, es1370,
-# pcidev, pcipnic, usb_ohci, usb_xhci and voodoo.
+# pcidev, pcipnic, usb_ehci, usb_ohci, usb_xhci and voodoo.
 #
 # Example:
 #   pci: enabled=1, chipset=i440fx, slot1=pcivga, slot2=ne2k
@@ -1123,10 +1123,19 @@ speaker: enabled=1, mode=sound
 #usb_ohci: enabled=1
 #usb_ohci: enabled=1, port1=printer:usbprinter.bin
 
+#=======================================================================
+# USB_EHCI:
+# This option controls the presence of the USB EHCI host controller with a
+# 6-port hub. The portX parameter accepts the same device types with the
+# same syntax as the UHCI controller (see above). The optionsX parameter is
+# also available on EHCI.
+#=======================================================================
+#usb_ehci: enabled=1
+
 #=======================================================================
 # USB_XHCI:
-# This option controls the presence of the experimental USB xHCI host controller
-# with a 4-port hub. The portX parameter accepts the same device types with the
+# This option controls the presence of the USB xHCI host controller with a
+# 4-port hub. The portX parameter accepts the same device types with the
 # same syntax as the UHCI controller (see above). The optionsX parameter is
 # also available on xHCI. NOTE: port 1 and 2 are USB3 and only support
 # super-speed devices, but port 3 and 4 are USB2 and support speed settings
diff --git a/bochs/.conf.everything b/bochs/.conf.everything
index a644c8e5c..2ae070c4e 100644
--- a/bochs/.conf.everything
+++ b/bochs/.conf.everything
@@ -32,6 +32,7 @@
   --enable-voodoo \
   --enable-usb \
   --enable-usb-ohci \
+  --enable-usb-ehci \
   --enable-usb-xhci \
   --enable-cdrom \
   --enable-sb16 \
diff --git a/bochs/.conf.linux b/bochs/.conf.linux
index f4fb685e7..64a800849 100755
--- a/bochs/.conf.linux
+++ b/bochs/.conf.linux
@@ -37,6 +37,8 @@ case $which_config in
                 --enable-voodoo \
                 --enable-usb \
                 --enable-usb-ohci \
+                --enable-usb-ehci \
+                --enable-usb-xhci \
                 --enable-es1370 \
                 --enable-e1000 \
                 --enable-show-ips \
@@ -59,6 +61,7 @@ case $which_config in
                 --enable-voodoo \
                 --enable-usb \
                 --enable-usb-ohci \
+                --enable-usb-ehci \
                 --enable-usb-xhci \
                 --enable-es1370 \
                 --enable-e1000 \
diff --git a/bochs/.conf.macos b/bochs/.conf.macos
index ee7ae2c84..e65425ce3 100755
--- a/bochs/.conf.macos
+++ b/bochs/.conf.macos
@@ -29,6 +29,7 @@ export CXXFLAGS
             --enable-voodoo \
             --enable-usb \
             --enable-usb-ohci \
+            --enable-usb-ehci \
             --enable-usb-xhci \
             --enable-es1370 \
             --enable-e1000 \
diff --git a/bochs/.conf.macosx b/bochs/.conf.macosx
index ae63073c0..5b1eef9fc 100644
--- a/bochs/.conf.macosx
+++ b/bochs/.conf.macosx
@@ -31,6 +31,7 @@ export LDFLAGS
             --enable-voodoo \
             --enable-usb \
             --enable-usb-ohci \
+            --enable-usb-ehci \
             --enable-usb-xhci \
             --enable-es1370 \
             --enable-e1000 \
diff --git a/bochs/.conf.win32-cygwin b/bochs/.conf.win32-cygwin
index 93f44b729..1e79a51f6 100755
--- a/bochs/.conf.win32-cygwin
+++ b/bochs/.conf.win32-cygwin
@@ -26,6 +26,7 @@ export CXXFLAGS
             --enable-voodoo \
             --enable-usb \
             --enable-usb-ohci \
+            --enable-usb-ehci \
             --enable-usb-xhci \
             --enable-es1370 \
             --enable-e1000 \
diff --git a/bochs/.conf.win32-vcpp b/bochs/.conf.win32-vcpp
index ff071b56e..9a3f97138 100755
--- a/bochs/.conf.win32-vcpp
+++ b/bochs/.conf.win32-vcpp
@@ -14,6 +14,7 @@ set echo
             --enable-voodoo \
             --enable-usb \
             --enable-usb-ohci \
+            --enable-usb-ehci \
             --enable-usb-xhci \
             --enable-es1370 \
             --enable-e1000 \
diff --git a/bochs/configure b/bochs/configure
index b8696b69e..d4e13e5a0 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 13008 2016-12-28 08:19:19Z vruppert .
+# From configure.in Id: configure.in 13009 2016-12-28 08:34:59Z vruppert .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -1772,9 +1772,8 @@ Optional Features:
                           host only)
   --enable-usb            enable USB UHCI support (no)
   --enable-usb-ohci       enable USB OHCI support (no)
-  --enable-usb-ehci       enable experimental USB EHCI support (no -
-                          incomplete)
-  --enable-usb-xhci       enable experimental USB xHCI support (no)
+  --enable-usb-ehci       enable USB EHCI support (no)
+  --enable-usb-xhci       enable USB xHCI support (no)
   --enable-ne2000         enable NE2000 support (no)
   --enable-pnic           enable PCI pseudo NIC support (no)
   --enable-e1000          enable Intel(R) Gigabit Ethernet support (no)
@@ -5190,7 +5189,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5193 "configure"' > conftest.$ac_ext
+  echo '#line 5192 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6878,11 +6877,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6881: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6880: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6885: \$? = $ac_status" >&5
+   echo "$as_me:6884: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7111,11 +7110,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7114: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7113: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7118: \$? = $ac_status" >&5
+   echo "$as_me:7117: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -7178,11 +7177,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7181: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7180: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7185: \$? = $ac_status" >&5
+   echo "$as_me:7184: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8968,7 +8967,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8971 "configure"
+#line 8970 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9066,7 +9065,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9069 "configure"
+#line 9068 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11181,11 +11180,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11184: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11183: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11188: \$? = $ac_status" >&5
+   echo "$as_me:11187: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11248,11 +11247,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11251: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11250: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11255: \$? = $ac_status" >&5
+   echo "$as_me:11254: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12273,7 +12272,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12276 "configure"
+#line 12275 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12371,7 +12370,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12374 "configure"
+#line 12373 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13194,11 +13193,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13197: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13196: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13201: \$? = $ac_status" >&5
+   echo "$as_me:13200: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13261,11 +13260,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13264: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13263: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13268: \$? = $ac_status" >&5
+   echo "$as_me:13267: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15226,11 +15225,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15229: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15228: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15233: \$? = $ac_status" >&5
+   echo "$as_me:15232: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15459,11 +15458,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15462: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15461: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15466: \$? = $ac_status" >&5
+   echo "$as_me:15465: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15526,11 +15525,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15529: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15528: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15533: \$? = $ac_status" >&5
+   echo "$as_me:15532: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17316,7 +17315,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17319 "configure"
+#line 17318 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17414,7 +17413,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17417 "configure"
+#line 17416 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19101,7 +19100,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19104 "configure"
+#line 19103 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -23427,8 +23426,8 @@ $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for experimental USB EHCI support" >&5
-$as_echo_n "checking for experimental USB EHCI support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB EHCI support" >&5
+$as_echo_n "checking for USB EHCI support... " >&6; }
 # Check whether --enable-usb-ehci was given.
 if test "${enable_usb_ehci+set}" = set; then :
   enableval=$enable_usb_ehci; if test "$enableval" = yes; then
@@ -23456,8 +23455,8 @@ $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for experimental USB xHCI support" >&5
-$as_echo_n "checking for experimental USB xHCI support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for USB xHCI support" >&5
+$as_echo_n "checking for USB xHCI support... " >&6; }
 # Check whether --enable-usb-xhci was given.
 if test "${enable_usb_xhci+set}" = set; then :
   enableval=$enable_usb_xhci; if test "$enableval" = yes; then
diff --git a/bochs/configure.in b/bochs/configure.in
index 66a5689dd..761acfd47 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -1558,9 +1558,9 @@ AC_ARG_ENABLE(usb-ohci,
     ]
   )
 
-AC_MSG_CHECKING(for experimental USB EHCI support)
+AC_MSG_CHECKING(for USB EHCI support)
 AC_ARG_ENABLE(usb-ehci,
-  AS_HELP_STRING([--enable-usb-ehci], [enable experimental USB EHCI support (no - incomplete)]),
+  AS_HELP_STRING([--enable-usb-ehci], [enable USB EHCI support (no)]),
   [if test "$enableval" = yes; then
     AC_MSG_RESULT(yes)
     AC_DEFINE(BX_SUPPORT_USB_EHCI, 1)
@@ -1577,9 +1577,9 @@ AC_ARG_ENABLE(usb-ehci,
     ]
   )
 
-AC_MSG_CHECKING(for experimental USB xHCI support)
+AC_MSG_CHECKING(for USB xHCI support)
 AC_ARG_ENABLE(usb-xhci,
-  AS_HELP_STRING([--enable-usb-xhci], [enable experimental USB xHCI support (no)]),
+  AS_HELP_STRING([--enable-usb-xhci], [enable USB xHCI support (no)]),
   [if test "$enableval" = yes; then
     AC_MSG_RESULT(yes)
     AC_DEFINE(BX_SUPPORT_USB_XHCI, 1)