Index: apps/settings_list.c
===================================================================
--- apps/settings_list.c	(revision 14229)
+++ apps/settings_list.c	(working copy)
@@ -47,6 +47,9 @@
 #include "radio.h"
 #endif
 
+#ifdef USE_USBSTACK
+#include "usbstack.h"
+#endif
 
 #define NVRAM(bytes) (bytes<<F_NVRAM_MASK_SHIFT)
 /** NOTE: NVRAM_CONFIG_VERSION is in settings_list.h
@@ -1248,6 +1251,12 @@
                 3, "list_accel_wait", UNIT_SEC, 1, 10, 1, 
                 scanaccel_formatter, scanaccel_getlang, NULL),
 #endif /* HAVE_SCROLLWHEEL */
+#ifdef USE_USBSTACK
+    CHOICE_SETTING(0, usb_stack_mode, LANG_USBSTACK_CONFIGURATION, 0, "usb mode",
+                 "automatic,device,host",
+                 usb_controller_select,
+                 3, ID2P(LANG_USBSTACK_AUTOMATIC), ID2P(LANG_USBSTACK_DEVICE), ID2P(LANG_USBSTACK_HOST)),                
+#endif
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);
Index: apps/settings.h
===================================================================
--- apps/settings.h	(revision 14229)
+++ apps/settings.h	(working copy)
@@ -743,6 +743,9 @@
     int list_accel_start_delay; /* ms before we start increaseing step size */
     int list_accel_wait; /* ms between increases */
 #endif
+//#ifdef USE_USBSTACK
+    int usb_stack_mode;	/* automatic, device or host */
+//#endif
 };
 
 /** global variables **/
Index: apps/menus/settings_menu.c
===================================================================
--- apps/menus/settings_menu.c	(revision 14229)
+++ apps/menus/settings_menu.c	(working copy)
@@ -442,7 +442,18 @@
 /*    VOICE MENU                   */
 /***********************************/
 
+#ifdef USE_USBSTACK
 /***********************************/
+/*    USB STACK MENU               */
+MENUITEM_SETTING(usbstack_mode, &global_settings.usb_stack_mode, NULL);
+
+MAKE_MENU(usbstack_menu, ID2P(LANG_USBSTACK), 0, Icon_file_view_menu,
+                &usbstack_mode);
+/*    USB STACK MENU               */
+/***********************************/
+#endif
+
+/***********************************/
 /*    SETTINGS MENU                */
 static int language_browse(void)
 {
@@ -458,6 +469,11 @@
           &tagcache_menu,
 #endif
           &display_menu, &system_menu,
-          &bookmark_settings_menu, &browse_langs, &voice_settings_menu );
+          &bookmark_settings_menu, &browse_langs, &voice_settings_menu
+
+#ifdef USE_USBSTACK
+          , &usbstack_menu
+#endif
+          );
 /*    SETTINGS MENU                */
 /***********************************/
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 14229)
+++ apps/lang/english.lang	(working copy)
@@ -11004,3 +11004,73 @@
     *: "Demos"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_USBSTACK
+  desc: in settings_menu
+  user:
+  <source>
+    *: "USB Stack"
+  </source>
+  <dest>
+    *: "USB Stack"
+  </dest>
+  <voice>
+    *: "USB Stack"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_CONFIGURATION
+  desc: in usbstack settings
+  user:
+  <source>
+    *: "USB Stack Configuration"
+  </source>
+  <dest>
+    *: "USB Stack Configuration"
+  </dest>
+  <voice>
+    *: "USB Stack Configuration"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_AUTOMATIC
+  desc: in usbstack settings
+  user:
+  <source>
+    *: "Automatic"
+  </source>
+  <dest>
+    *: "Automatic"
+  </dest>
+  <voice>
+    *: "Automatic"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_DEVICE
+  desc: in usbstack settings
+  user:
+  <source>
+    *: "Device"
+  </source>
+  <dest>
+    *: "Device"
+  </dest>
+  <voice>
+    *: "Device"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_HOST
+  desc: in usbstack settings
+  user:
+  <source>
+    *: "Host"
+  </source>
+  <dest>
+    *: "Host"
+  </dest>
+  <voice>
+    *: "Host"
+  </voice>
+</phrase>
\ No newline at end of file