diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 70a1c4373..258d0f973 100644
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -43,7 +43,7 @@ my %usage = (
     PPC specific:
        rinv <noderange> [bus|config|serial|model|firm|all]",
     "rsetboot" => 
-"Usage: rsetboot <noderange> [net|hd|cd|def|stat] [-V|--verbose]
+"Usage: rsetboot <noderange> [net|hd|cd|floppy|def|stat] [-V|--verbose]
        rsetboot [-h|--help|-v|--version]",
     "rbootseq" => 
 "Usage: rbootseq <noderange> [hd0|hd1|hd2|hd3|net|iscsi|usbflash|floppy|none],...
diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm
index 335b9a6cc..3e5650939 100644
--- a/xCAT-server/lib/xcat/plugins/ipmi.pm
+++ b/xCAT-server/lib/xcat/plugins/ipmi.pm
@@ -1162,6 +1162,7 @@ sub setboot {
         2 => 'Hard Drive',
         5 => 'CD/DVD',
         6 => 'BIOS Setup',
+        15 => 'Floppy'
     );
 
     #This disables the 60 second timer
@@ -1179,6 +1180,9 @@ sub setboot {
     elsif ($subcommand eq "cd" ) {
         @cmd=(0x08,0x5,0x80,0x14,0x0,0x0,0x0);
     }
+    elsif ($subcommand eq "floppy" ) {
+        @cmd=(0x08,0x5,0x80,0x3c,0x0,0x0,0x0);
+    }
     elsif ($subcommand =~ m/^def/) {
         @cmd=(0x08,0x5,0x0,0x0,0x0,0x0,0x0);
     }