diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index b257a3a539..a0889b8281 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -96,8 +96,8 @@ PLUGIN_HEADER
 #define PONG_PAUSE BUTTON_MENU
 #define PONG_LEFT_UP BUTTON_UP
 #define PONG_LEFT_DOWN BUTTON_DOWN
-#define PONG_RIGHT_UP BUTTON_POWER
-#define PONG_RIGHT_DOWN BUTTON_MENU
+#define PONG_RIGHT_UP BUTTON_VOL_UP
+#define PONG_RIGHT_DOWN BUTTON_VOL_DOWN
 
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD)
 #define PONG_QUIT BUTTON_POWER
diff --git a/docs/CREDITS b/docs/CREDITS
index 8a19740d2c..86b5958043 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -279,3 +279,4 @@ Nick Vanderweit
 Simon Menzel
 Timo Horstschäfer
 Jacco Koning
+Chris Ham