diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 38f4fe1aa1..31ad42ebdf 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -158,10 +158,12 @@ static void setoptions (void)
         options.DOWN=BUTTON_DOWN;
 
         options.A=BUTTON_SELECT;
-        options.B=BUTTON_LEFT;
+        options.B=BUTTON_HOME;
         options.START=BUTTON_SCROLL_BACK;
         options.SELECT=BUTTON_SCROLL_FWD;
-        options.MENU=BUTTON_HOME;
+        options.MENU=BUTTON_POWER;
+        options.LEFT=BUTTON_LEFT;
+        options.RIGHT=BUTTON_RIGHT;
 
 #elif CONFIG_KEYPAD == SANSA_C200_PAD
         options.UP=BUTTON_UP;
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c
index 7dc33797c3..ec43827b29 100644
--- a/apps/plugins/rockboy/sys_rockbox.c
+++ b/apps/plugins/rockboy/sys_rockbox.c
@@ -26,7 +26,7 @@
 #include "hw.h"
 #include "config.h"
 
-#if CONFIG_KEYPAD == SANSA_E200_PAD
+#if CONFIG_KEYPAD == SANSA_E200_PAD || SANSA_FUZE_PAD
 #define ROCKBOY_SCROLLWHEEL
 #define ROCKBOY_SCROLLWHEEL_CC  BUTTON_SCROLL_BACK
 #define ROCKBOY_SCROLLWHEEL_CW  BUTTON_SCROLL_FWD
diff --git a/docs/CREDITS b/docs/CREDITS
index cb491f1ab4..ce2f0ed3f8 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -470,6 +470,7 @@ Marko Pahlke
 Vytenis Sabelka
 Nicolas Pitre
 Benedikt Goos
+Frederick Full
 
 The libmad team
 The wavpack team