diff --git a/confluent_client/bin/nodesetboot b/confluent_client/bin/nodesetboot
index 690907a4..c20ca368 100755
--- a/confluent_client/bin/nodesetboot
+++ b/confluent_client/bin/nodesetboot
@@ -32,7 +32,7 @@ if path.startswith('/opt'):
 import confluent.client as client
 
 argparser = optparse.OptionParser(
-    usage='Usage: %prog [options] noderange [default|cd|network|setup|hd|floppy]')
+    usage='Usage: %prog [options] noderange [default|cd|network|setup|hd|usb|floppy]')
 argparser.add_option('-b', '--bios', dest='biosmode',
                      action='store_true', default=False,
                      help='Request BIOS style boot (rather than UEFI)')
diff --git a/confluent_client/confluent_env.sh b/confluent_client/confluent_env.sh
index 5989f3db..97073971 100644
--- a/confluent_client/confluent_env.sh
+++ b/confluent_client/confluent_env.sh
@@ -91,7 +91,7 @@ _confluent_nodeidentify_completion()
 
 _confluent_nodesetboot_completion()
 {
-    COMP_CANDIDATES=("default,cd,network,setup,hd,floppy -h -b -p")
+    COMP_CANDIDATES=("default,cd,network,setup,hd,floppy,usb -h -b -p")
     _confluent_generic_completion
 }
 
diff --git a/confluent_client/doc/man/nodesetboot.ronn b/confluent_client/doc/man/nodesetboot.ronn
index 4219363c..b2b49e3c 100644
--- a/confluent_client/doc/man/nodesetboot.ronn
+++ b/confluent_client/doc/man/nodesetboot.ronn
@@ -4,7 +4,7 @@ nodesetboot(8) -- Check or set next boot device for noderange
 ## SYNOPSIS
 
 `nodesetboot <noderange>`  
-`nodesetboot [options] <noderange> [default|cd|network|setup|hd|floppy]`
+`nodesetboot [options] <noderange> [default|cd|network|setup|hd|usb|floppy]`
 
 ## DESCRIPTION
 
@@ -46,6 +46,10 @@ control.
   Request boot from floppy.  Generally speaking firmware uses this to mean a USB
   flash drive or similar (whether virtual or physical).
 
+* `usb`:
+  Request boot from usb.  Generally speaking firmware uses this to mean a USB
+  flash drive or similar (whether virtual or physical).
+
 * `network`:
   Request boot to network
   
diff --git a/confluent_server/confluent/messages.py b/confluent_server/confluent/messages.py
index 1d31dc12..2f6ab998 100644
--- a/confluent_server/confluent/messages.py
+++ b/confluent_server/confluent/messages.py
@@ -1147,6 +1147,7 @@ class BootDevice(ConfluentChoiceMessage):
         'default',
         'cd',
         'floppy',
+        'usb',
     ])
 
     valid_bootmodes = set([