diff --git a/confluent_client/bin/nodesetboot b/confluent_client/bin/nodesetboot
index cb596148..690907a4 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]')
+    usage='Usage: %prog [options] noderange [default|cd|network|setup|hd|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 beeb0cd5..492ee6dc 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 -h -b -p")
+    COMP_CANDIDATES=("default,cd,network,setup,hd,floppy -h -b -p")
     _confluent_generic_completion
 }
 
diff --git a/confluent_client/doc/man/nodesetboot.ronn b/confluent_client/doc/man/nodesetboot.ronn
index dce303b1..6d1d1a04 100644
--- a/confluent_client/doc/man/nodesetboot.ronn
+++ b/confluent_client/doc/man/nodesetboot.ronn
@@ -42,6 +42,10 @@ control.
   remote media mounted as CD/DVD, and detachable hard disks drives such as usb
   key devices.
   
+* `floppy`:
+  Request boot from floppy.  Generally speaking firmware uses this to mean a USB
+  flash drive or similar (whether virtual or physical).
+
 * `network`:
   Request boot to network